Merge omap-drivers

Conflicts:

	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/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/board-n800-usb.c
	arch/arm/plat-omap/Kconfig
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/devices.c
	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/video/omap/omapfb_main.c
	include/asm-arm/arch-omap/dsp.h
	include/asm-arm/hardware/tsc2101.h
	net/ipv4/netfilter/ipt_IDLETIMER.c

diff --cc Makefile
Simple merge

diff --cc arch/arm/mach-omap2/io.c
index 871fde3,2769171..5fa7fc2
--- 1/arch/arm/mach-omap2/io.c
--- 2/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -42,12 -42,6 +42,50 @@@ static struct map_desc omap2_io_desc[] 
                .length         = L3_24XX_SIZE,
                .type           = MT_DEVICE
        },
-               .virtual        = L4_24XX_VIRT,
-               .pfn            = __phys_to_pfn(L4_24XX_PHYS),
-               .length         = L4_24XX_SIZE,
++#ifdef CONFIG_ARCH_OMAP2430
++      {
++              .virtual        = L4_WK_243X_VIRT,
++              .pfn            = __phys_to_pfn(L4_WK_243X_PHYS),
++              .length         = L4_WK_243X_SIZE,
++              .type           = MT_DEVICE
++      },
++      {
++              .virtual        = OMAP243X_GPMC_VIRT,
++              .pfn            = __phys_to_pfn(OMAP243X_GPMC_PHYS),
++              .length         = OMAP243X_GPMC_SIZE,
++              .type           = MT_DEVICE
++      },
++      {
++              .virtual        = OMAP243X_SDRC_VIRT,
++              .pfn            = __phys_to_pfn(OMAP243X_SDRC_PHYS),
++              .length         = OMAP243X_SDRC_SIZE,
++              .type           = MT_DEVICE
++      },
++      {
++              .virtual        = OMAP243X_SMS_VIRT,
++              .pfn            = __phys_to_pfn(OMAP243X_SMS_PHYS),
++              .length         = OMAP243X_SMS_SIZE,
++              .type           = MT_DEVICE
++      },
++#endif
++      {
++              .virtual        = DSP_MEM_24XX_VIRT,
++              .pfn            = __phys_to_pfn(DSP_MEM_24XX_PHYS),
++              .length         = DSP_MEM_24XX_SIZE,
++              .type           = MT_DEVICE
++      },
++      {
++              .virtual        = DSP_IPI_24XX_VIRT,
++              .pfn            = __phys_to_pfn(DSP_IPI_24XX_PHYS),
++              .length         = DSP_IPI_24XX_SIZE,
++              .type           = MT_DEVICE
++      },
 +      {
++              .virtual        = DSP_MMU_24XX_VIRT,
++              .pfn            = __phys_to_pfn(DSP_MMU_24XX_PHYS),
++              .length         = DSP_MMU_24XX_SIZE,
 +              .type           = MT_DEVICE
 +      },
  #ifdef CONFIG_ARCH_OMAP2430
        {
                .virtual        = L4_WK_243X_VIRT,