]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2bebe152b72141e84d1539333e04b5e125589903
tree62bf85b58c0e108b3c5597bfb5d492efd8322726
parent10622227deebd4d62a613f0da1f4535667b4e0fb
parentc615bdc32707ae3ac1223ea9ca3ed1c797b946cc
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