Merge branch 'for-4.3/microsoft' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Sep 2015 13:38:33 +0000 (15:38 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Sep 2015 13:38:33 +0000 (15:38 +0200)
commitf212bd95a9f62b7929c59b16e1d3bbde2fb4081d
tree62bf85b58c0e108b3c5597bfb5d492efd8322726
parent8c4de9bc2041229fb778e0c47e32585b6f6b1d09
parent0439de75d32c249bd9f5824ffd5e40c4c2109d77
Merge branch 'for-4.3/microsoft' into for-linus

Conflicts:
drivers/hid/usbhid/hid-quirks.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/usbhid/hid-quirks.c