Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Aug 2012 04:45:54 +0000 (21:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Aug 2012 04:45:54 +0000 (21:45 -0700)
commitd37e44969e60dc652fdbaf4397d5436e07c967af
tree8a130821c1b4aaa7fae9df7d474af576fce7359b
parentfea7a08acb13524b47711625eebea40a0ede69a0
parent53c84983549230495156d7da666cd1acdb9c9015
Merge branch 'upstream-fixes' of git://git./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
drivers/hid/hid-core.c