summaryrefslogtreecommitdiffstats
path: root/drivers/hid/i2c-hid/i2c-hid.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-22 08:22:40 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-22 08:22:40 +0100
commit1c241131a126df9bfb930f27d2fe8887971af0c7 (patch)
tree32387adc81cc28741aad801affc2398d1061267d /drivers/hid/i2c-hid/i2c-hid.c
parent19eddab9d94b5a47f154b6a244c7294a505b946f (diff)
parent86b84167d4e67372376a57ea9955c5d53dae232f (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/hid/i2c-hid/i2c-hid.c')
0 files changed, 0 insertions, 0 deletions