]> 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)
commitf76c99015da244ffcba47a5bb099596c0f74575f
treefcd7f4118654286c1e634c87e4ad3efcea3c637d
parente18cee0c575052d5cdb4472d423f171f9cb24076
parent159381f28fe465d4a7e58ac83b68c66eb75c56a0
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