]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 10 Jul 2017 09:11:05 +0000 (11:11 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 10 Jul 2017 09:11:05 +0000 (11:11 +0200)
commit604250ddcf874c4ee4137bf754f57fa903a3c1c1
treee6c64576e933ca81540aff02909e500a713b59d3
parent4f94ff4e9c52b40250b8f5a54c9f99101de31e9d
parent1694130910cd654a9215fbc0244975e3cf208fc1
parent6e7edabfc6a8ac5dce8c55363a7bb1576fc9348f
Merge branches 'for-4.13/ish' and 'for-4.13/ite' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-ids.h