Commits
Merge branch '3.10/fb-mmap' into for-next Merge topic branch to get vm_iomap_memory into use. Conflicts: drivers/video/fbmon.c
Merge branch '3.10/fb-mmap' into for-next Merge topic branch to get vm_iomap_memory into use. Conflicts: drivers/video/fbmon.c