]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Oct 2010 20:46:33 +0000 (13:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Oct 2010 20:46:33 +0000 (13:46 -0700)
commitafe147466c8f22a69eb470ab504608a9f4ae3345
treec77ff084297c8e421017e236f65fd1a8c0ccb185
parent5710c2b275b3c0434f0de8f4ce6721aaf4c2a100
parentf6cd378372bff06093d72f978c0150eeed3ea201
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: wacom - fix runtime PM related deadlock
  Input: joydev - fix JSIOCSAXMAP ioctl
  Input: uinput - setup MT usage during device creation