Merge tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Apr 2013 16:15:46 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Apr 2013 16:15:46 +0000 (09:15 -0700)
commitc4c80f63fb97cd9a82cd35579eeb6467f3d485fc
treed8cf6df01b1c8580b94bfe8fb9ba5cd8b37fbc79
parent8f09aacfa6cf64c469fe60c05dfc1bd75e8615ed
parent090da752cdd6f0786eee68c8dea8db7c8abd3798
Merge tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/linux

Pull fbdev fixes from Tomi Valkeinen:
 "Fix uvesafb crash bug and typoed flag name in fbmon's new videomode
  code"

* tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/linux:
  video:uvesafb: Fix dereference NULL pointer code path
  fbmon: use VESA_DMT_VSYNC_HIGH to fix typo