From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Apr 2012 02:42:56 +0000 (-0700)
Subject: Merge tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linux-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a1c0cad352520206305b1a3c2658097721454855;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linux-2.6

Pull fbdev fixes from Florian Tobias Schandinat:
 - a compile fix for au1*fb
 - a fix to make kyrofb usable on x86_64
 - a fix for uvesafb to prevent an oops due to NX-protection

 "The fix for kyrofb is a bit large but it's just replacing "unsigned
  long" by "u32" for 64 bit compatibility."

* tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linux-2.6:
  video:uvesafb: Fix oops that uvesafb try to execute NX-protected page
  fbdev: fix au1*fb builds
  kyrofb: fix on x86_64
---

a1c0cad352520206305b1a3c2658097721454855