diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-07 09:30:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-07 09:30:36 -0700 |
| commit | fd848319e751739a93aa9fc8182e57e87c5a0df1 (patch) | |
| tree | 51630ac89d44fe866828a0d436563d145edd4efd /drivers/ata | |
| parent | 4f97c9b206c4bf6ed5ad31091ec2eb9c2204e44c (diff) | |
| parent | f50f9aabf32db7414551ffdfdccc71be5f3d6e7d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- fix for hidraw reference counting regression, by Manoj Chourasia
- fix for minor number allocation for uhid, by David Herrmann
- other small unsorted fixes / device ID additions
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: wiimote: fix FF deadlock
HID: add Holtek USB ID 04d9:a081 SHARKOON DarkGlider
HID: hidraw: close underlying device at removal of last reader
HID: roccat: Fix "cannot create duplicate filename" problems
HID: uhid: allocate static minor
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions