Merge branch '3.10/fb-mmap' into for-next fbdev-for-3.10
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 26 Apr 2013 06:14:47 +0000 (09:14 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 26 Apr 2013 06:14:47 +0000 (09:14 +0300)
commit9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd
tree966b838e2190a7d6868cda5f4eee6d0f490da27c
parente45f265e7ea3ee6de24efe91fe2928d603cb1741
parent138f296e140f79cb955caba70690076fb14e6f6d
Merge branch '3.10/fb-mmap' into for-next

Merge topic branch to get vm_iomap_memory into use.

Conflicts:
drivers/video/fbmon.c
drivers/video/fbmon.c