]> 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)
commit21d7911758ddec664fa993cd51600075e5c5100c
tree62bf85b58c0e108b3c5597bfb5d492efd8322726
parentdf47ca68958dc74beb3b403f2c677f55af031138
parent5ab06f2438e6501a650503c84c63754d3a8d154b
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