Merge branch '3.10/fb-mmap' into for-next

Merge topic branch to get vm_iomap_memory into use.

Conflicts:
	drivers/video/fbmon.c

diff --cc drivers/video/fbmon.c
index e5cc2fdb4c8db4f3956ff9978d2470173591af83,7f6709991a5c60d26a4b892ac24c0331cda06b58..6103fa6fb54f08137f0b36a7ecb54f3e7b0ebf77
--- 1/drivers/video/fbmon.c
--- 2/drivers/video/fbmon.c
+++ b/drivers/video/fbmon.c
@@@ -1398,13 -1398,13 +1398,13 @@@ int fb_videomode_from_videomode(const s
  
        fbmode->sync = 0;
        fbmode->vmode = 0;
 -      if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH)
 +      if (vm->flags & DISPLAY_FLAGS_HSYNC_HIGH)
                fbmode->sync |= FB_SYNC_HOR_HIGH_ACT;
-       if (vm->flags & DISPLAY_FLAGS_HSYNC_HIGH)
 -      if (vm->dmt_flags & VESA_DMT_VSYNC_HIGH)
++      if (vm->flags & DISPLAY_FLAGS_VSYNC_HIGH)
                fbmode->sync |= FB_SYNC_VERT_HIGH_ACT;
 -      if (vm->data_flags & DISPLAY_FLAGS_INTERLACED)
 +      if (vm->flags & DISPLAY_FLAGS_INTERLACED)
                fbmode->vmode |= FB_VMODE_INTERLACED;
 -      if (vm->data_flags & DISPLAY_FLAGS_DOUBLESCAN)
 +      if (vm->flags & DISPLAY_FLAGS_DOUBLESCAN)
                fbmode->vmode |= FB_VMODE_DOUBLE;
        fbmode->flag = 0;