diff options
author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:38:33 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:38:33 +0200 |
commit | f212bd95a9f62b7929c59b16e1d3bbde2fb4081d (patch) | |
tree | 62bf85b58c0e108b3c5597bfb5d492efd8322726 /Documentation/ABI | |
parent | Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4.3/lenovo', 'for-4.3/logitech', 'for-4.3/multitouch', 'for-4.3/picolcd', 'for-4.3/rmi', 'for-4.3/sensor-hub', 'for-4.3/sony' and 'for-4.3/wacom' into for-linus (diff) | |
parent | HID: microsoft: Add Surface 3 type cover (diff) | |
download | linux-dev-f212bd95a9f62b7929c59b16e1d3bbde2fb4081d.tar.xz linux-dev-f212bd95a9f62b7929c59b16e1d3bbde2fb4081d.zip |
Merge branch 'for-4.3/microsoft' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'Documentation/ABI')
0 files changed, 0 insertions, 0 deletions