Merge omap-drivers

Conflicts:

	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/Makefile
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/mailbox.c
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/mailbox.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dsp/Kconfig
	arch/arm/plat-omap/dsp/dsp_common.c
	arch/arm/plat-omap/dsp/dsp_common.h
	arch/arm/plat-omap/dsp/omap1_dsp.h
	arch/arm/plat-omap/mailbox.c
	arch/arm/plat-omap/mailbox.h
	drivers/Makefile
	drivers/cbus/tahvo-usb.c
	drivers/spi/omap2_mcspi.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/mailbox.h
	include/asm-arm/arch-omap/omap24xx.h

diff --cc Makefile
Simple merge