fbdev updates for 2.6.37-rc7

Please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git fbdev-fixes-for-linus

Which contains:

Tomi Valkeinen (2):
OMAP: DSS: VRAM: Align start & size of vram to 2M
OMAP: OMAPFB: disable old omapfb for OMAP4 builds

 drivers/video/omap/Kconfig |    4 ++--
 drivers/video/omap2/vram.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)