diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-09 21:18:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-09 21:18:48 -0800 |
| commit | 28023d2a8e9121b1b06c3b46e523c3c7a3e8b530 (patch) | |
| tree | b80df11d4277f1ed42c882f0a4433c7daef1f6d7 /drivers/leds/leds.h | |
| parent | 1dd34daa80966f013a7829643c7e70d49fa425a7 (diff) | |
| parent | 606185b20caf4c57d7e41e5a5ea4aff460aef2ab (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID updates from Jiri Kosina:
- bounds checking fixes in logitech and roccat drivers, from Peter Wu
and Dan Carpenter
- double-kfree fix in i2c-hid driver on bus shutdown, from Mika
Westerberg
- a couple of various small driver fixes
- a few device id additions
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: roccat: potential out of bounds in pyra_sysfs_write_settings()
HID: Add a new id 0x501a for Genius MousePen i608X
HID: logitech-hidpp: prefix the name with "Logitech"
HID: logitech-hidpp: avoid unintended fall-through
HID: Allow HID_BATTERY_STRENGTH to be enabled
HID: i2c-hid: Do not free buffers in i2c_hid_stop()
HID: add battery quirk for USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO keyboard
HID: logitech-hidpp: check WTP report length
HID: logitech-dj: check report length
Diffstat (limited to 'drivers/leds/leds.h')
0 files changed, 0 insertions, 0 deletions