Merge tag 'v3.11' into next

Merge with mainline to bring in sync changes to cyttsp4 driver.

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/input/touchscreen/cyttsp4_core.c
Simple merge

diff --cc drivers/tty/sysrq.c
Simple merge

diff --cc include/uapi/linux/input.h
Simple merge