diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-27 20:41:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-27 20:41:54 -0800 |
| commit | ba33fef0f62a97e1faf285a5ee2bcad85622f4fd (patch) | |
| tree | 20cfba3b21a8edaffc118958cc0a1d7f746ac3cb /drivers/mfd/adp5520.c | |
| parent | b7fe6bf7f40e73400a4da959d1ba14e29961c6de (diff) | |
| parent | 80897aa787ecd58eabb29deab7cbec9249c9b7e6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fix compat ioctl leak in uhid, by David Herrmann
- fix scheduling in atomic context (causing actual lockups in real
world) in hid-sony driver, by Sven Eckelmann
- revert patch introducing VID/PID conflict, by Jiri Kosina
- support from various new device IDs by Benjamin Tissoires and
KaiChung Cheng
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: uhid: fix leak for 64/32 UHID_CREATE
HID: kye: fix unresponsive keyboard
HID: kye: Add report fixup for Genius Manticore Keyboard
HID: multicouh: add PID VID to support 1 new Wistron optical touch device
HID: appleir: force input to be set
Revert "HID: wiimote: add LEGO-wiimote VID"
HID: sony: Send FF commands in non-atomic context
Diffstat (limited to 'drivers/mfd/adp5520.c')
0 files changed, 0 insertions, 0 deletions