Merge branch 'for-4.12/asus' into for-linus

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-debug.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/usbhid/hiddev.c
Simple merge