Merge omap-drivers

Merge branches 'master' and 'omap-drivers'

Conflicts:

	arch/arm/boot/.gitignore
	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/irq.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
	drivers/video/omap/dispc.c
	drivers/video/omap/hwa742.c
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_h2.c
	drivers/video/omap/lcd_h3.c
	drivers/video/omap/lcd_h4.c
	drivers/video/omap/lcd_inn1510.c
	drivers/video/omap/lcd_inn1610.c
	drivers/video/omap/lcd_mipid.c
	drivers/video/omap/lcd_osk.c
	drivers/video/omap/lcd_p2.c
	drivers/video/omap/lcd_palmte.c
	drivers/video/omap/lcd_palmtt.c
	drivers/video/omap/lcd_palmz71.c
	drivers/video/omap/lcd_sx1.c
	drivers/video/omap/lcdc.c
	drivers/video/omap/omapfb_main.c
	drivers/video/omap/rfbi.c
	drivers/video/omap/sossi.c
	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/hardware.h
	include/asm-arm/arch-omap/io.h
	include/asm-arm/arch-omap/menelaus.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/spi/tsc2102.h
	net/ipv4/netfilter/Kconfig

diff --cc Makefile
Simple merge

diff --cc arch/arm/boot/.gitignore
index fc9b99cfcdd0ada120c333f80aa6872c281db4cb,ce1c5ff746e7d2930fc0ec2005b6e65b35bd9a91..bbe9905f3ae79aff1c7d3c2814b351d33fd82537
--- 1/arch/arm/boot/.gitignore
--- 2/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@@ -1,3 -1,5 +1,5 @@@
  Image
  zImage
 -uImage
 +uImage
+ xipImage
+ bootpImage

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

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

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

diff --cc include/linux/input.h
index a6315593a0d818384c70f9811a4257d1ed966543,d8521c72f69f9ff4aad1fc97223cd6dbadd5923d..36fa51ecf340f5109ce327f0dbb21f29ba11fc85
--- 1/include/linux/input.h
--- 2/include/linux/input.h
+++ b/include/linux/input.h
@@@ -336,27 -344,15 +344,27 @@@ struct input_absinfo 
  #define KEY_BRIGHTNESSUP      225
  #define KEY_MEDIA             226
  
 -#define KEY_SWITCHVIDEOMODE   227
 -#define KEY_KBDILLUMTOGGLE    228
 -#define KEY_KBDILLUMDOWN      229
 -#define KEY_KBDILLUMUP                230
 +
 +/*Zeus: these keys are defined for OMAP730 Perseus2*/
 +#define KEY_STAR              227
 +#define KEY_SHARP             228
 +#define KEY_SOFT1             229
 +#define KEY_SOFT2             230
 +#define KEY_SEND              231
 +#define KEY_CENTER            232
 +#define KEY_HEADSETHOOK               233
 +#define KEY_0_5                       234
 +#define KEY_2_5                       235
 +
 +#define KEY_SWITCHVIDEOMODE   236
 +#define KEY_KBDILLUMTOGGLE    237
 +#define KEY_KBDILLUMDOWN      238
 +#define KEY_KBDILLUMUP                239
  
- #define KEY_SEND              231
- #define KEY_REPLY             232
- #define KEY_FORWARDMAIL               233
- #define KEY_SAVE              234
+ #define KEY_SEND              231     /* AC Send */
+ #define KEY_REPLY             232     /* AC Reply */
+ #define KEY_FORWARDMAIL               233     /* AC Forward Msg */
+ #define KEY_SAVE              234     /* AC Save */
  #define KEY_DOCUMENTS         235
  
  #define KEY_BATTERY           236