Merge with ../linux-2.6

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mm/flush.c
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/char/watchdog/Kconfig
Simple merge

diff --cc drivers/char/watchdog/Makefile
index 22aad4b3e509b14ae944afb47416e3f7d523eb09,bc6f5fe88c8c24f200c13a0caf38fc3c02d6344a..1e430edc30320427afc44b074e4c3cb92587af5c
--- 1/drivers/char/watchdog/Makefile
--- 2/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@@ -27,9 -27,9 +27,10 @@@ obj-$(CONFIG_21285_WATCHDOG) += wdt285.
  obj-$(CONFIG_977_WATCHDOG) += wdt977.o
  obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
  obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
 +obj-$(CONFIG_OMAP16XX_WATCHDOG) += omap1610_wdt.o
  obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
  obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
+ obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
  
  # X86 (i386 + ia64 + x86_64) Architecture
  obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Makefile
Simple merge

diff --cc drivers/i2c/chips/Kconfig
Simple merge

diff --cc drivers/i2c/chips/isp1301_omap.c
Simple merge

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

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

diff --cc drivers/mmc/mmc.c
Simple merge

diff --cc drivers/mmc/mmc_block.c
Simple merge

diff --cc drivers/serial/8250.c
Simple merge

diff --cc drivers/video/Makefile
Simple merge

diff --cc include/linux/input.h
index 595649e995fbcefdc0c4b3db09e662ae195c1c6d,e8c296ff6257adeccdd9d60245f463d1ea0255a3..1de70ae4a3413de8ed23f895de260ce8dee0d3b2
--- 1/include/linux/input.h
--- 2/include/linux/input.h
+++ b/include/linux/input.h
@@@ -328,23 -332,17 +332,29 @@@ 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_DOCUMENTS         235
+ 
  #define KEY_UNKNOWN           240
  
  #define BTN_MISC              0x100

diff --cc kernel/printk.c
Simple merge