tree d2cb3908fe6816cad851da7a914f404abd2cea76
parent b0c3844d8af6b9f3f18f31e1b0502fbefa2166be
parent b99ddbf83c064382b145d2156cc819d1eb4fc54d
author Paul Mundt <lethal@linux-sh.org> 1292510321 +0900
committer Paul Mundt <lethal@linux-sh.org> 1292510321 +0900

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