diff options
author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:13:17 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:13:17 +0200 |
commit | 5c891d5e094c15bd7791dc84749b5239257f5f2d (patch) | |
tree | bcfc6ca02f988aef9860de3a4fe52589151f8db3 /drivers/hid/i2c-hid/i2c-hid.c | |
parent | 38e50c9ba84ad755247220ce6a881fbdb44aaeec (diff) | |
parent | 0acb310c3273d55ad19c9a5f48b73224ce6e2dc0 (diff) | |
download | talos-op-linux-5c891d5e094c15bd7791dc84749b5239257f5f2d.tar.gz talos-op-linux-5c891d5e094c15bd7791dc84749b5239257f5f2d.zip |
Merge branch 'for-4.14/upstream' into for-linus
- usb_device_id and snd_rawmidi_ops constifications from Julia Lawall
and Arvind Yadav
Diffstat (limited to 'drivers/hid/i2c-hid/i2c-hid.c')
0 files changed, 0 insertions, 0 deletions