]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDmitry Torokhov <dtor@insightbb.com>
Tue, 1 May 2007 04:24:54 +0000 (00:24 -0400)
committerDmitry Torokhov <dtor@insightbb.com>
Tue, 1 May 2007 04:24:54 +0000 (00:24 -0400)
commitbc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775
tree427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1
parent3d29cdff999c37b3876082278a8134a0642a02cd
parentdc87c3985e9b442c60994308a96f887579addc39
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/usb/input/Makefile
drivers/usb/input/gtco.c
arch/mips/cobalt/Makefile
drivers/input/keyboard/Kconfig
drivers/input/keyboard/gpio_keys.c
drivers/input/serio/i8042.c
drivers/input/touchscreen/ucb1400_ts.c
drivers/usb/input/Makefile
drivers/usb/input/gtco.c