]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 May 2009 15:48:25 +0000 (08:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 May 2009 15:48:25 +0000 (08:48 -0700)
commit5f789cd8bae9b6315b7bf93e24ec1ac85f5a13b9
tree42a0c72316275101803aa972e7292f74c6d07a4f
parent3da9e9d34ed7d2f5c33fd194d9dd09e15f4e51c0
parenta3ce6ea46cc0d6397d1b92b1a5983bb2935306ed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: libps2 - better handle bad scheduler decisions
  Input: usb1400_ts - fix access to "device data" in resume function
  Input: multitouch - augment event semantics documentation
  Input: multitouch - add tracking ID to the protocol