Merge omap-drivers

Merge branches 'master' and '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-omap1/board-palmte.c
	arch/arm/mach-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap2/Kconfig
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-apollon-keys.c
	arch/arm/mach-omap2/board-apollon.c
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n800-audio.c
	arch/arm/mach-omap2/board-n800-dsp.c
	arch/arm/mach-omap2/board-n800-usb.c
	arch/arm/mach-omap2/board-n800.c
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/memory.c
	arch/arm/mach-omap2/pm.c
	arch/arm/mach-omap2/sleep.S
	arch/arm/plat-omap/Makefile
	arch/arm/plat-omap/common.c
	arch/arm/plat-omap/dsp/dsp_common.c
	arch/arm/plat-omap/dsp/dsp_common.h
	arch/arm/plat-omap/dsp/omap2_dsp.h
	arch/arm/plat-omap/timer32k.c
	drivers/Makefile
	drivers/i2c/busses/i2c-omap.c
	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/i2c/chips/menelaus.c
	drivers/i2c/chips/tlv320aic23.c
	drivers/i2c/chips/twl4030_core.c
	drivers/mtd/onenand/omap2.c
	drivers/spi/Kconfig
	drivers/spi/omap2_mcspi.c
	drivers/spi/tsc2101.c
	drivers/spi/tsc2102.c
	drivers/spi/tsc2301-core.c
	drivers/video/omap/Kconfig
	drivers/video/omap/Makefile
	include/asm-arm/arch-omap/board-2430sdp.h
	include/asm-arm/arch-omap/eac.h
	include/asm-arm/arch-omap/gpio.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/mmc.h
	include/asm-arm/arch-omap/omap24xx.h
	include/asm-arm/arch-omap/onenand.h
	include/asm-arm/arch-omap/pm.h
	include/asm-arm/arch-omap/twl4030.h
	include/asm-arm/hardware/tsc2101.h
	include/linux/i2c-id.h
	include/linux/spi/tsc2102.h
	net/ipv4/netfilter/Kconfig

diff --cc Makefile
Simple merge

diff --cc arch/arm/mach-omap1/board-palmte.c
index 0e97b79dd23f7c6f5ae5f830fe1c71e8ec660997,2f9d00a001351da0b4806dc524beed96ce58d2b0..e5e095772d075633e8826e16bebbff6471b35da6
--- 1/arch/arm/mach-omap1/board-palmte.c
--- 2/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@@ -7,11 -7,9 +7,11 @@@
   *
   * Original version : Laurent Gonzalez
   *
-  * Maintainters : http://palmtelinux.sf.net
+  * Maintainers : http://palmtelinux.sf.net
   *                palmtelinux-developpers@lists.sf.net
   *
 + * Copyright (c) 2006 Andrzej Zaborowski  <balrog@zabor.org>
 + *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.

diff --cc include/asm-arm/setup.h
Simple merge

diff --cc include/linux/i2c-id.h
index 6fd01d79dc4cd8ea35edd95397af45c758d9ffad,202cdaaee8c339f2ed98d0d561ad67c81b107890..aa83d41630965400af10535b4a29b2ce724a40bc
--- 1/include/linux/i2c-id.h
--- 2/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@@ -119,10 -119,8 +119,6 @@@
  #define I2C_DRIVERID_WM8750           90      /* Wolfson WM8750 audio codec */
  #define I2C_DRIVERID_WM8753           91      /* Wolfson WM8753 audio codec */
  
- #define I2C_DRIVERID_MISC     99      /* Whatever until sorted out    */
- 
--#define I2C_DRIVERID_MISC     99      /* Whatever until sorted out    */
--
  #define I2C_DRIVERID_I2CDEV   900
  #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
  #define I2C_DRIVERID_ALERT      903    /* SMBus Alert Responder Client  */