]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
Some manual fixups required due to clashes with the PF_FREEZE cleanups.

16 files changed:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge