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)
Conflicts:
drivers/hid/hid-core.c


Trivial merge