Merge branch 'logitech' into for-next

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hid/hid-lenovo-tpkbd.c
Simple merge

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

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

diff --cc drivers/input/mouse/sentelic.c
Simple merge

diff --cc drivers/input/tablet/wacom_wac.c
Simple merge

diff --cc drivers/input/touchscreen/edt-ft5x06.c
Simple merge