From: Paul Mundt Date: Thu, 16 Dec 2010 14:38:41 +0000 (+0900) Subject: Merge branch 'for-paul-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e13416ae7f378f9963ceca596ac464d4120093f3;p=linux-beck.git 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 --- e13416ae7f378f9963ceca596ac464d4120093f3