Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Thu, 11 Dec 2008 01:30:44 +0000 (17:30 -0800)

committer Tony Lindgren <tony@atomide.com>

Thu, 11 Dec 2008 01:30:44 +0000 (17:30 -0800)
author Tony Lindgren <tony@atomide.com>
Thu, 11 Dec 2008 01:30:44 +0000 (17:30 -0800)
committer Tony Lindgren <tony@atomide.com>
Thu, 11 Dec 2008 01:30:44 +0000 (17:30 -0800)
diff --cc Makefile
Simple merge
diff --cc arch/arm/plat-omap/include/mach/omapfb.h
Simple merge
diff --cc arch/arm/plat-omap/sram.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Thu, 11 Dec 2008 01:30:44 +0000 (17:30 -0800)
committer	Tony Lindgren <tony@atomide.com>
	Thu, 11 Dec 2008 01:30:44 +0000 (17:30 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/mach/omapfb.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/sram.c	patch \|	diff1 \|	diff2 \|	blob \| history