err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a94130e e511988)

author	Linus Torvalds <torvalds@ppc970.osdl.org>
	Mon, 27 Jun 2005 21:47:31 +0000 (14:47 -0700)
committer	Linus Torvalds <torvalds@ppc970.osdl.org>
	Mon, 27 Jun 2005 21:47:31 +0000 (14:47 -0700)
commit	3e0777b8fa96f7073ed5d13d3bc1d573b766bef9
tree	3849e8457dd8f038ab7da025c708e275b43ea9c1	tree \| snapshot
parent	a94130e00038ebeb2f66901a4a4a9e05a03051c1	commit \| diff
parent	e5119885f00874453e837e3407014b73de2f4741	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/input/evdev.c	diff1 \|	diff2 \|	blob \| history
drivers/input/input.c	diff1 \|	diff2 \|	blob \| history
drivers/input/joydev.c	diff1 \|	diff2 \|	blob \| history
drivers/input/keyboard/atkbd.c	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/alps.c	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/psmouse.h	diff1 \|	diff2 \|	blob \| history
drivers/input/mousedev.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/input/aiptek.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/input/hid-core.c	diff1 \|	diff2 \|	blob \| history
include/linux/input.h	diff1 \|	diff2 \|	blob \| history
sound/oss/Kconfig	diff1 \|	diff2 \|	blob \| history
sound/oss/es1370.c	diff1 \|	diff2 \|	blob \| history
sound/oss/es1371.c	diff1 \|	diff2 \|	blob \| history
sound/oss/esssolo1.c	diff1 \|	diff2 \|	blob \| history
sound/pci/cs4281.c	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree