Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 20:09:47 +0000 (13:09 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 20:09:47 +0000 (13:09 -0700)
commit84860bf0644d7c45afe7ddbd30731c3e3c371fae
treed6c4b98a9c3fd9981e7fcc5d7729c9e01e327767
parent8caf89157d64f1eedba37113afb4b303b2b3e301
parent6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6
include/linux/input.h