Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

diff --cc arch/mips/cobalt/Makefile
index c35ee25e5578bd0f3c4426eba2d82b6c5732c18e,de017c11f9b79a38de7939b6d6c49ee2286113ba..9565b2104dcd1dc5fc505997766afcebf9944f97
--- 1/arch/mips/cobalt/Makefile
--- 2/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@@ -2,8 -2,8 +2,8 @@@
  # Makefile for the Cobalt micro systems family specific parts of the kernel
  #
  
 -obj-y  := irq.o reset.o setup.o
 +obj-y  := irq.o reset.o setup.o buttons.o
  
+ obj-$(CONFIG_PCI)             += pci.o
  obj-$(CONFIG_EARLY_PRINTK)    += console.o
- 
- EXTRA_AFLAGS := $(CFLAGS)
+ obj-$(CONFIG_MTD_PHYSMAP)     += mtd.o

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

diff --cc drivers/input/keyboard/gpio_keys.c
Simple merge

diff --cc drivers/input/serio/i8042.c
Simple merge

diff --cc drivers/input/touchscreen/ucb1400_ts.c
Simple merge

diff --cc drivers/usb/input/Makefile
index f8c35b66c4668bb7715bb0543c37b7602834f748,9bf420eef77fb6c5b10b878dca4ca14ae1b7837d..284a0734e0cd6180f6237dc6b2a59bd74ccdc77c
--- 1/drivers/usb/input/Makefile
--- 2/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@@ -33,11 -8,11 +8,8 @@@ wacom-objs    := wacom_wac.o wacom_sys.
  obj-$(CONFIG_USB_AIPTEK)      += aiptek.o
  obj-$(CONFIG_USB_ATI_REMOTE)  += ati_remote.o
  obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o
- obj-$(CONFIG_USB_HID)         += usbhid.o
- obj-$(CONFIG_USB_KBD)         += usbkbd.o
  obj-$(CONFIG_USB_KBTAB)               += kbtab.o
  obj-$(CONFIG_USB_KEYSPAN_REMOTE)      += keyspan_remote.o
- obj-$(CONFIG_USB_MOUSE)               += usbmouse.o
 -obj-$(CONFIG_USB_MTOUCH)      += mtouchusb.o
 -obj-$(CONFIG_USB_ITMTOUCH)    += itmtouch.o
 -obj-$(CONFIG_USB_EGALAX)      += touchkitusb.o
  obj-$(CONFIG_USB_TOUCHSCREEN) += usbtouchscreen.o
  obj-$(CONFIG_USB_POWERMATE)   += powermate.o
  obj-$(CONFIG_USB_WACOM)               += wacom.o
@@@ -45,7 -20,7 +17,7 @@@ obj-$(CONFIG_USB_ACECAD)      += acecad.
  obj-$(CONFIG_USB_YEALINK)     += yealink.o
  obj-$(CONFIG_USB_XPAD)                += xpad.o
  obj-$(CONFIG_USB_APPLETOUCH)  += appletouch.o
--obj-$(CONFIG_USB_GTCO)         += gtco.o
++obj-$(CONFIG_USB_GTCO)                += gtco.o
  
  ifeq ($(CONFIG_USB_DEBUG),y)
  EXTRA_CFLAGS += -DDEBUG

diff --cc drivers/usb/input/gtco.c
index dbd207efb8f581019b1a608323a6a17391a0b92f,ae756e0afc996fd5d50d1192a7c062bc3a38145f..b2ca10f2fe0e48b74d8cf22739f8623561a09c7c
--- 1/drivers/usb/input/gtco.c
--- 2/drivers/usb/input/gtco.c
+++ b/drivers/usb/input/gtco.c
@@@ -223,10 -225,11 +223,10 @@@ static void parse_hid_report_descriptor
        __u32 oldval[TAG_GLOB_MAX];
  
        /* Debug stuff */
--      char  maintype='x';
++      char  maintype = 'x';
        char  globtype[12];
 -      int   indent=0;
 -      char  indentstr[10]="";
 -
 +      int   indent = 0;
 +      char  indentstr[10] = "";
  
  
        dbg("======>>>>>>PARSE<<<<<<======");