diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 16:38:33 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 16:38:33 +0300 |
| commit | f212bd95a9f62b7929c59b16e1d3bbde2fb4081d (patch) | |
| tree | 62bf85b58c0e108b3c5597bfb5d492efd8322726 /drivers/hid/hid-apple.c | |
| parent | 8c4de9bc2041229fb778e0c47e32585b6f6b1d09 (diff) | |
| parent | 0439de75d32c249bd9f5824ffd5e40c4c2109d77 (diff) | |
| download | linux-f212bd95a9f62b7929c59b16e1d3bbde2fb4081d.tar.xz | |
Merge branch 'for-4.3/microsoft' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/hid-apple.c')
0 files changed, 0 insertions, 0 deletions