Merge branch 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
authorPaul Mundt <lethal@linux-sh.org>
Thu, 16 Dec 2010 14:38:41 +0000 (23:38 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 16 Dec 2010 14:38:41 +0000 (23:38 +0900)
* 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux:
  OMAP: OMAPFB: disable old omapfb for OMAP4 builds
  OMAP: DSS: VRAM: Align start & size of vram to 2M


Trivial merge