From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Aug 2012 04:45:54 +0000 (-0700)
Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v3.6-rc4~27
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d37e44969e60dc652fdbaf4397d5436e07c967af;p=~andy%2Flinux

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
---

d37e44969e60dc652fdbaf4397d5436e07c967af