commit f4ef084226f82ca923bf0a2658bb2876bd215ec1
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jun 16 09:45:47 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jun 16 09:45:47 2011 -0700
tree 5097279680df51891f70f8afe0d52555b772e7a8
parent df9d030c1324e9b75a425903f9f66bbc960bf713
parent d521dd944e461371cb309c7c3568483cd2b6f5f2

Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x

* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:
  fbdev: sh_mobile_hdmi: fix regression: statically enable RTPM
  fbdev/atyfb: Fix 2 defined-but-not-used warnings
  efifb: Fix call to wrong unregister function
  video: s3c-fb: move enabling channel for window
  video: s3c-fb: fix virtual resolution checking
  video: s3c-fb: fix misleading kfree in remove function