Commits

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/usb/input/Makefile drivers/usb/input/gtco.c
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/usb/input/Makefile drivers/usb/input/gtco.c