Merge branch '3.10/fb-mmap' into for-next
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)
Merge topic branch to get vm_iomap_memory into use.

Conflicts:
drivers/video/fbmon.c


Trivial merge