Merge branch 'omap4_and_sdrc_2.6.27' of git://git.pwsan.com/linux-2.6 into omap-for...
authorTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 20:17:13 +0000 (13:17 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 20:17:13 +0000 (13:17 -0700)
1  2 
arch/arm/mach-omap2/hsmmc.c
arch/arm/mach-omap2/id.c
arch/arm/plat-omap/include/plat/common.h

Simple merge
Simple merge