projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a94130e
e511988
)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually
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)
Some manual fixups required due to clashes with the PF_FREEZE cleanups.
16 files changed:
1
2
Documentation/kernel-parameters.txt
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/evdev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/input.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/joydev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/keyboard/atkbd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/mouse/alps.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/mouse/psmouse.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/mousedev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/input/aiptek.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/input/hid-core.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/input.h
patch
|
diff1
|
diff2
|
blob
|
history
sound/oss/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
sound/oss/es1370.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/oss/es1371.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/oss/esssolo1.c
patch
|
diff1
|
diff2
|
blob
|
history
sound/pci/cs4281.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/kernel-parameters.txt
Simple merge
diff --cc
drivers/input/evdev.c
Simple merge
diff --cc
drivers/input/input.c
Simple merge
diff --cc
drivers/input/joydev.c
Simple merge
diff --cc
drivers/input/keyboard/atkbd.c
Simple merge
diff --cc
drivers/input/mouse/alps.c
Simple merge
diff --cc
drivers/input/mouse/psmouse.h
Simple merge
diff --cc
drivers/input/mousedev.c
Simple merge
diff --cc
drivers/usb/input/aiptek.c
Simple merge
diff --cc
drivers/usb/input/hid-core.c
Simple merge
diff --cc
include/linux/input.h
Simple merge
diff --cc
sound/oss/Kconfig
Simple merge
diff --cc
sound/oss/es1370.c
Simple merge
diff --cc
sound/oss/es1371.c
Simple merge
diff --cc
sound/oss/esssolo1.c
Simple merge
diff --cc
sound/pci/cs4281.c
Simple merge