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)
commit91f6c90c8df1818a66d177e105d602c3da820919
tree5cb1b01823dd676a07596f6153d2fc124c4691cb
parent6e457bb05c348e196f67005876992ceb5eb0430a
parenta3fed9bc181666df6ecfe9ce34a29d48803f2310
Merge branch 'omap4_and_sdrc_2.6.27' of git://git.pwsan.com/linux-2.6 into omap-for-linus
arch/arm/mach-omap2/hsmmc.c
arch/arm/mach-omap2/id.c
arch/arm/plat-omap/include/plat/common.h