| commit | 3390e579b3dac71e630ed879a73c5ac3b4447045 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Tue May 17 12:41:22 2016 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Tue May 17 12:41:22 2016 +0200 |
| tree | fcd7f4118654286c1e634c87e4ad3efcea3c637d | |
| parent | 27fd38c5226ed0f1712d071880fa8e739eb78650 [diff] | |
| parent | 282bf1fe6dca4b768d6bedc14aea1b82c36241c1 [diff] |
Merge branch 'for-4.7/upstream' into for-linus Conflicts: drivers/hid/usbhid/hid-quirks.c