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)
commite13416ae7f378f9963ceca596ac464d4120093f3
treed2cb3908fe6816cad851da7a914f404abd2cea76
parentb0c3844d8af6b9f3f18f31e1b0502fbefa2166be
parentb99ddbf83c064382b145d2156cc819d1eb4fc54d
Merge branch 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev-fixes-for-linus

* '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