Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus
commit73c5ef126f40b0b872e5964ff65dbe792eeec493
authorTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:19:53 +0000 (8 10:19 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:19:53 +0000 (8 10:19 -0700)
tree064ab090a0b8cdda4f542ecd308c17fcee349aae
parent582c77d783e0cb1e6c30a330e42582173bcadfd2
parent243e76b426e6e040961b84249b4eaab4ad9fa6dc
parent64be97822b781e921c7eda2d4089fd1fdf3aabba
Merge branches 'devel-omap1' and 'devel-omap2plus' into omap-for-linus
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/plat-omap/include/plat/mmc.h