Merge branch 'roccat' into for-next

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/Makefile
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/hid-picolcd.c
Simple merge

diff --cc drivers/hid/hid-roccat-common.c
Simple merge

diff --cc include/linux/hid.h
Simple merge