From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Apr 2013 16:15:46 +0000 (-0700)
Subject: Merge tag 'fbdev-fixes-3.9-rc6' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Tag: v3.9-rc6~15
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c4c80f63fb97cd9a82cd35579eeb6467f3d485fc;p=linux.git

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
---

c4c80f63fb97cd9a82cd35579eeb6467f3d485fc