]> err.no Git - linux-2.6/commit
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 27 Jun 2005 21:47:31 +0000 (14:47 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 27 Jun 2005 21:47:31 +0000 (14:47 -0700)
commit3e0777b8fa96f7073ed5d13d3bc1d573b766bef9
tree3849e8457dd8f038ab7da025c708e275b43ea9c1
parenta94130e00038ebeb2f66901a4a4a9e05a03051c1
parente5119885f00874453e837e3407014b73de2f4741
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually

Some manual fixups required due to clashes with the PF_FREEZE cleanups.
16 files changed:
Documentation/kernel-parameters.txt
drivers/input/evdev.c
drivers/input/input.c
drivers/input/joydev.c
drivers/input/keyboard/atkbd.c
drivers/input/mouse/alps.c
drivers/input/mouse/psmouse.h
drivers/input/mousedev.c
drivers/usb/input/aiptek.c
drivers/usb/input/hid-core.c
include/linux/input.h
sound/oss/Kconfig
sound/oss/es1370.c
sound/oss/es1371.c
sound/oss/esssolo1.c
sound/pci/cs4281.c