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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mach-omap1/board-h3.c
Simple merge

diff --cc arch/arm/mach-omap1/board-nokia770.c
Simple merge

diff --cc arch/arm/mach-omap1/board-osk.c
index 15d913e98e22a007149a1927ebb802d67754fad4,7d0cf7af88ceb8c420b5fdb912edf3f3358170f8..969dec5422344752b73a869a555893b428697377
--- 1/arch/arm/mach-omap1/board-osk.c
--- 2/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@@ -29,8 -29,8 +29,9 @@@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/platform_device.h>
 +#include <linux/interrupt.h>
  #include <linux/irq.h>
+ #include <linux/interrupt.h>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>

diff --cc arch/arm/mach-omap1/irq.c
Simple merge

diff --cc arch/arm/mach-omap2/board-h4.c
Simple merge

diff --cc arch/arm/mach-omap2/irq.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/char/Kconfig
Simple merge

diff --cc drivers/char/Makefile
Simple merge

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

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

diff --cc drivers/i2c/busses/i2c-omap.c
Simple merge

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

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

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/net/smc91x.h
Simple merge

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

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/usb/Kconfig
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/gadget/omap_udc.c
index 35e16919646749b343a6e570cf7cdbdc989377a4,15d77c30793093e18014c9fafd63daa6376e0095..91b3bb098d9f4f618b0eb6a60f47adb3b480463c
--- 1/drivers/usb/gadget/omap_udc.c
--- 2/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@@ -2173,13 -2118,10 +2174,13 @@@ int usb_gadget_unregister_driver (struc
  
        if (!udc)
                return -ENODEV;
-       if (!driver || driver != udc->driver)
+       if (!driver || driver != udc->driver || !driver->unbind)
                return -EINVAL;
  
 -      if (machine_is_omap_innovator() || machine_is_omap_osk())
 +      if (udc->dc_clk != NULL)
 +              omap_udc_enable_clock(1);
 +
 +      if (machine_needs_vbus_session())
                omap_vbus_session(&udc->gadget, 0);
  
        if (udc->transceiver)

diff --cc drivers/usb/host/ohci-omap.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/Makefile
Simple merge

diff --cc include/asm-arm/setup.h
index bc8329fa4dbbd63b983ff8003424d84ff416ea5a,e5407392afcad0413c0df46030f51e2c93c4fd5b..42f00678b362f2b684b5ec610f41d7ed8ce7d999
--- 1/include/asm-arm/setup.h
--- 2/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@@ -128,19 -130,12 +130,19 @@@ struct tag_cmdline 
  #define ATAG_ACORN    0x41000101
  
  struct tag_acorn {
-       u32 memc_control_reg;
-       u32 vram_pages;
-       u8 sounddefault;
-       u8 adfsdrives;
+       __u32 memc_control_reg;
+       __u32 vram_pages;
+       __u8 sounddefault;
+       __u8 adfsdrives;
  };
  
 +/* TI OMAP specific information */
 +#define ATAG_BOARD       0x414f4d50
 +
 +struct tag_omap {
 +      u8 data[0];
 +};
 +
  /* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
  #define ATAG_MEMCLK   0x41000402
  

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

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

diff --cc include/linux/i2c-id.h
Simple merge

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

diff --cc kernel/printk.c
Simple merge

diff --cc net/ipv4/netfilter/Kconfig
Simple merge

diff --cc net/ipv4/netfilter/Makefile
Simple merge