tree 62bf85b58c0e108b3c5597bfb5d492efd8322726
parent 8c4de9bc2041229fb778e0c47e32585b6f6b1d09
parent 0439de75d32c249bd9f5824ffd5e40c4c2109d77
author Jiri Kosina <jkosina@suse.cz> 1441114713 +0200
committer Jiri Kosina <jkosina@suse.cz> 1441114713 +0200

Merge branch 'for-4.3/microsoft' into for-linus

Conflicts:
	drivers/hid/usbhid/hid-quirks.c