tree 8a130821c1b4aaa7fae9df7d474af576fce7359b
parent fea7a08acb13524b47711625eebea40a0ede69a0
parent 53c84983549230495156d7da666cd1acdb9c9015
author Linus Torvalds <torvalds@linux-foundation.org> 1345783554 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1345783554 -0700

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