From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Jul 2012 15:15:55 +0000 (-0700)
Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v3.5~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61c901c56905256a4a4d7c2af92d66200a2ee7f2;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'upstream-fixes' of git://git./linux/kernel/git/jikos/hid

Pull HID update from Jiri Kosina:
 "A final round of changes for HID for 3.5: just device ID additions."

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hid-multitouch: add support for Zytronic panels
  HID: add Sennheiser BTD500USB device support
  HID: add battery quirk for Apple Wireless ANSI
---

61c901c56905256a4a4d7c2af92d66200a2ee7f2