Merge 7xx-iosplit-plat-merge with omap-fixes
authorTony Lindgren <tony@atomide.com>
Sun, 22 Nov 2009 18:08:43 +0000 (10:08 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 22 Nov 2009 18:08:43 +0000 (10:08 -0800)
commita76df42a675c9936e8bf3607226e74c8a5e2d847
tree96d93706d884dea956393653452fa4d78d8d7f76
parent648f4e3e50c4793d9dbf9a09afa193631f76fa26
parent8171d88089ad63fc442b2bf32af7c18653adc5cb
Merge 7xx-iosplit-plat-merge with omap-fixes

Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
13 files changed:
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-zoom2.c
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/clock34xx.h
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/mailbox.c
arch/arm/plat-omap/cpu-omap.c
arch/arm/plat-omap/dma.c
arch/arm/plat-omap/gpio.c
drivers/mmc/host/omap.c
sound/soc/omap/omap-pcm.c
sound/soc/omap/omap3evm.c