]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-4.12/asus' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 2 May 2017 09:02:41 +0000 (11:02 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 2 May 2017 09:02:41 +0000 (11:02 +0200)
1  2 
Documentation/admin-guide/kernel-parameters.txt
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-debug.c
drivers/hid/hid-ids.h
drivers/hid/usbhid/hiddev.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge