| commit | d37e44969e60dc652fdbaf4397d5436e07c967af | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 23 21:45:54 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 23 21:45:54 2012 -0700 |
| tree | 8a130821c1b4aaa7fae9df7d474af576fce7359b | |
| parent | fea7a08acb13524b47711625eebea40a0ede69a0 [diff] | |
| parent | 53c84983549230495156d7da666cd1acdb9c9015 [diff] |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid Pull HID fix from Jiri Kosina: "Fix for one particular device not being properly claimed by hid-multitouch driver" * 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Remove QUANTA from special drivers list