| commit | afe147466c8f22a69eb470ab504608a9f4ae3345 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 07 13:46:33 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 07 13:46:33 2010 -0700 |
| tree | c77ff084297c8e421017e236f65fd1a8c0ccb185 | |
| parent | 5710c2b275b3c0434f0de8f4ce6721aaf4c2a100 [diff] | |
| parent | f6cd378372bff06093d72f978c0150eeed3ea201 [diff] |
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