]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Apr 2012 02:42:56 +0000 (19:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Apr 2012 02:42:56 +0000 (19:42 -0700)
commitc5c84434eda8f43ee54834d421c2ab61f3173706
tree82f850ea19e1750549a1e7ea414c2c6ab032362a
parentb5ae3e8ee02e26950cf005816521587db8dc9b35
parent6078a858a03a85723c81c37853c13950d4a1c6db
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