diff options
| author | Linus Torvalds <[email protected]> | 2016-10-19 09:56:57 -0700 | 
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-10-19 09:56:57 -0700 | 
| commit | 8a1e377e55f2dca5c689926313beeaa8ac2adb22 (patch) | |
| tree | a0123dcf7c2268e48f6c23900df74eca0ae477e8 /drivers/net/xen-netback/xenbus.c | |
| parent | b6ffb11e4e5b6d1ae61c26c90255877fa4749eca (diff) | |
| parent | 4973ca9a01e2354b159acedec1b9b8eb8de02ab7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
 - hid-dr regression fix for certain dragonrise gamepads (device ID
   0079:0006), from Ioan-Adrian Ratiu
 - dma-on-stack fix for hid-led driver, from Heiner Kallweit
 - quirk for Akai MIDImix device
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: add quirk for Akai MIDImix.
  Revert "HID: dragonrise: fix HID Descriptor for 0x0006 PID"
  HID: hid-dr: add input mapping for axis selection
  HID: hid-led: fix issue with transfer buffer not being dma capable
Diffstat (limited to 'drivers/net/xen-netback/xenbus.c')
0 files changed, 0 insertions, 0 deletions