tree 418b338bcb2014768ede10e73179c7afbaf1736d
parent ded75664d1a7d74c1976da0969ddb31ad9839d4c
parent 34e75dca4e6313249c9a2faa8effeddce89b91ac
author Jiri Kosina <jkosina@suse.cz> 1396372001 +0200
committer Jiri Kosina <jkosina@suse.cz> 1396372001 +0200

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

Conflicts:
	drivers/hid/hid-core.c