]> git.baikalelectronics.ru Git - kernel.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)
commitc36c1ce85c222b2c392df22413d96e3ad8180e85
tree427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1
parentcf56d0aee66f2dab83380209dc77eedf1be67403
parent71447057337ac6425ddd64fca6c26f69271354ee
Merge master.kernel.org:/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