commit a1c0cad352520206305b1a3c2658097721454855
author Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 13 19:42:56 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 13 19:42:56 2012 -0700
tree 82f850ea19e1750549a1e7ea414c2c6ab032362a
parent 659e45d8a0aca8619f0d308448c480279fa002b6
parent b78f29ca0516266431688c5eb42d39ce42ec039a

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