]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-4.7/upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:41:22 +0000 (12:41 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:41:22 +0000 (12:41 +0200)
commitc448478c60c05e59332910a02154866e90985cc9
treefcd7f4118654286c1e634c87e4ad3efcea3c637d
parent7312e2479f315f4a045d7bfa36f5ac425c375741
parent12e05ef426c2b92307783ca9bc04cd6d13ef7dff
Merge branch 'for-4.7/upstream' into for-linus

Conflicts:
drivers/hid/usbhid/hid-quirks.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hidraw.c
drivers/hid/usbhid/hid-quirks.c