Merge omap-drivers

Conflicts:

	arch/arm/Kconfig
	arch/arm/configs/omap_h2_1610_defconfig
	arch/arm/configs/omap_osk_5912_defconfig
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	arch/arm/plat-omap/dsp/dsp_common.c
	arch/arm/plat-omap/mailbox.c
	drivers/Makefile
	drivers/cbus/Kconfig
	drivers/cbus/retu-pwrbutton.c
	drivers/cbus/tahvo-usb.c
	drivers/video/omap/Kconfig
	include/linux/i2c-id.h

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
index b5e8832e7b34e4484e0173ab88b81412841146df,f86656a7d1facc4318aa1341684436e866a75674..d75879d9ddeb71dae7ff09c7840bfb538d8362a6
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -961,12 -987,10 +987,6 @@@ source "drivers/mmc/Kconfig
  
  source "drivers/rtc/Kconfig"
  
- source "drivers/ssi/Kconfig"
- 
--if ARCH_OMAP
--source "drivers/cbus/Kconfig"
--endif
--
  endmenu
  
  source "fs/Kconfig"

diff --cc drivers/video/Kconfig
Simple merge