Dmitry Torokhov bc95f3669f Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/usb/input/Makefile drivers/usb/input/gtco.c		2007-05-01 00:24:54 -04:00
..
buttons.c
console.c
irq.c
Makefile	Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2007-05-01 00:24:54 -04:00
mtd.c
pci.c
reset.c
setup.c