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/board-n800-usb.c
	arch/arm/mach-omap2/mailbox.c
	arch/arm/mach-omap2/pm.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/gpio.c
	arch/arm/plat-omap/mailbox.c
	arch/arm/plat-omap/mailbox.h
	drivers/Makefile
	drivers/i2c/chips/gpio_expander_omap.c
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/mtd/onenand/omap2.c
	drivers/spi/omap2_mcspi.c
	drivers/video/omap/lcd_h2.c
	drivers/video/omap/omapfb_main.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/arch-omap/mailbox.h
	include/asm-arm/arch-omap/omapfb.h
	include/asm-arm/hardware/tsc2101.h
	net/ipv4/netfilter/ipt_IDLETIMER.c

diff --cc arch/arm/configs/omap_h2_1610_defconfig
index 7c246b9ad0f8ae1f024e48f2e8439ab8388be72e,28816227f2507cab9ca2e8c20441014750ec52ec..fd4d093624ec4601eef94f88f7d16b248408f110
--- 1/arch/arm/configs/omap_h2_1610_defconfig
--- 2/arch/arm/configs/omap_h2_1610_defconfig
+++ b/arch/arm/configs/omap_h2_1610_defconfig
@@@ -749,22 -647,8 +749,22 @@@ CONFIG_TPS65010=
  #
  # SPI support
  #
 -# CONFIG_SPI is not set
 -# CONFIG_SPI_MASTER is not set
 +CONFIG_SPI=y
 +# CONFIG_SPI_DEBUG is not set
 +CONFIG_SPI_MASTER=y
 +
 +#
 +# SPI Master Controller Drivers
 +#
 +CONFIG_SPI_BITBANG=y
 +CONFIG_SPI_OMAP_UWIRE=y
 +
 +#
 +# SPI Protocol Masters
 +#
- CONFIG_TSC2101=y
++CONFIG_SPI_TSC2101=y
 +# CONFIG_TSC2102 is not set
 +# CONFIG_SPI_AT25 is not set
  
  #
  # Dallas's 1-wire bus

diff --cc arch/arm/mach-omap1/board-h2.c
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/media/radio/Kconfig
Simple merge

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge