From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Oct 2013 07:22:40 +0000 (+0100)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v3.12-rc7~27
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1c241131a126df9bfb930f27d2fe8887971af0c7;p=linux-2.6-block.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

Pull HID fixes from Jiri Kosina:

 - a partial revert of exponent parsing changes to make "Unit" exponent
   item work properly again, by Nikolai Kondrashov

 - a few new device IDs additions piggy-backing, by AceLan Kao and David
   Herrmann

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wiimote: add LEGO-wiimote VID
  HID: Fix unit exponent parsing again
  HID: usbhid: quirk for SiS Touchscreen
  HID: usbhid: quirk for Synaptics Large Touchccreen
---

1c241131a126df9bfb930f27d2fe8887971af0c7