summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-23 21:45:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-23 21:45:54 -0700
commitd37e44969e60dc652fdbaf4397d5436e07c967af (patch)
tree8a130821c1b4aaa7fae9df7d474af576fce7359b /kernel
parentfea7a08acb13524b47711625eebea40a0ede69a0 (diff)
parent53c84983549230495156d7da666cd1acdb9c9015 (diff)
downloadlinux-d37e44969e60dc652fdbaf4397d5436e07c967af.tar.bz2
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions