Merge with /home/tmlind/src/kernel/linux-2.6

diff --cc Makefile
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

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

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

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

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

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

diff --cc drivers/input/keyboard/Makefile
index a2f928a,9ce0b87..df33964
--- 1/drivers/input/keyboard/Makefile
--- 2/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@@ -14,7 -14,7 +14,8 @@@ obj-$(CONFIG_KEYBOARD_LOCOMO)         += locom
  obj-$(CONFIG_KEYBOARD_NEWTON)         += newtonkbd.o
  obj-$(CONFIG_KEYBOARD_98KBD)          += 98kbd.o
  obj-$(CONFIG_KEYBOARD_CORGI)          += corgikbd.o
+ obj-$(CONFIG_KEYBOARD_SPITZ)          += spitzkbd.o
  obj-$(CONFIG_KEYBOARD_HIL)            += hil_kbd.o
  obj-$(CONFIG_KEYBOARD_HIL_OLD)                += hilkbd.o
 -
 +obj-$(CONFIG_KEYBOARD_OMAP)             += omap-keypad.o
 +obj-$(CONFIG_OMAP_PS2)                        += innovator_ps2.o

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

diff --cc drivers/video/Kconfig
Simple merge

diff --cc include/asm-arm/arch-omap/memory.h
index af8bc25,ef32d61..ae98583
--- 1/include/asm-arm/arch-omap/memory.h
--- 2/include/asm-arm/arch-omap/memory.h
+++ b/include/asm-arm/arch-omap/memory.h
@@@ -84,8 -84,7 +84,7 @@@
                                        virt_to_lbus(addr) : \
                                        __virt_to_bus(addr);})
  
 -#endif        /* CONFIG_ARCH_OMAP1510 */
 +#endif        /* CONFIG_ARCH_OMAP15XX */
  
- #define PHYS_TO_NID(addr) (0)
  #endif
  

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

diff --cc include/linux/fb.h
Simple merge

diff --cc kernel/printk.c
Simple merge

diff --cc sound/arm/Kconfig
Simple merge