Merge 7xx-iosplit-plat-merge with omap-fixes
Tony Lindgren [Sun, 22 Nov 2009 18:08:43 +0000 (10:08 -0800)]
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus

13 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge