Merge branch 'for-3.15/microsoft' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:06:41 +0000 (19:06 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:06:41 +0000 (19:06 +0200)
commit6cf8c85f8bc320ca0273c5261cc13ee1491d7b92
tree418b338bcb2014768ede10e73179c7afbaf1736d
parentded75664d1a7d74c1976da0969ddb31ad9839d4c
parent34e75dca4e6313249c9a2faa8effeddce89b91ac
Merge branch 'for-3.15/microsoft' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-microsoft.c