diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 16:42:39 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 16:42:39 +0900 |
| commit | 81e97f01371f4e1701feeafe484665112cd9ddc2 (patch) | |
| tree | 9e45a6841066f55230befe132d4fc3d1f146532d /drivers/nvdimm/nd-core.h | |
| parent | 6d90eb7ba341b3eb035121eff0b69d370cbc251e (diff) | |
| parent | d471b6b22d37bf9928c6d0202bdaaf76583b8b61 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- Wacom 2nd-gen Intuos Pro large Y axis handling fix from Jason Gerecke
- fix for hibernation in Intel ISH driver, from Even Xu
- crash fix for hid-steam driver, from Rodrigo Rivas Costa
- new device ID addition to google-hammer driver
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: wacom: Correct logical maximum Y for 2nd-gen Intuos Pro large
HID: intel_ish-hid: ipc: register more pm callbacks to support hibernation
HID: steam: use hid_device.driver_data instead of hid_set_drvdata()
HID: google: Add support for whiskers
Diffstat (limited to 'drivers/nvdimm/nd-core.h')
0 files changed, 0 insertions, 0 deletions