tree 42a0c72316275101803aa972e7292f74c6d07a4f
parent 3da9e9d34ed7d2f5c33fd194d9dd09e15f4e51c0
parent a3ce6ea46cc0d6397d1b92b1a5983bb2935306ed
author Linus Torvalds <torvalds@linux-foundation.org> 1243612105 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243612105 -0700

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