Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Dec 2010 17:49:54 +0000 (09:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Dec 2010 17:49:54 +0000 (09:49 -0800)
commit7aeb3be341cc7f1fbf2b98fbef980a816736fe8e
tree38be8872bfd928fd128e64a8ea9754effb0c7220
parent07058599b486fe342f371200ac4718fedbe9a354
parente13416ae7f378f9963ceca596ac464d4120093f3
Merge branch 'fbdev-fixes-for-linus' of git://git./linux/kernel/git/lethal/fbdev-2.6

* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
  OMAP: OMAPFB: disable old omapfb for OMAP4 builds
  OMAP: DSS: VRAM: Align start & size of vram to 2M