Merge 7xx-iosplit-plat-merge with omap-fixes

Merge branch '7xx-iosplit-plat-merge' into omap-for-linus

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge

diff --cc arch/arm/mach-omap2/board-zoom2.c
Simple merge

diff --cc arch/arm/mach-omap2/clock34xx.c
Simple merge

diff --cc arch/arm/mach-omap2/clock34xx.h
Simple merge

diff --cc arch/arm/mach-omap2/gpmc.c
Simple merge

diff --cc arch/arm/mach-omap2/mailbox.c
Simple merge

diff --cc arch/arm/plat-omap/cpu-omap.c
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc arch/arm/plat-omap/gpio.c
Simple merge

diff --cc drivers/mmc/host/omap.c
Simple merge

diff --cc sound/soc/omap/omap-pcm.c
Simple merge

diff --cc sound/soc/omap/omap3evm.c
Simple merge