Merge tag 'v3.11' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 18 Sep 2013 14:58:33 +0000 (07:58 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 18 Sep 2013 14:58:33 +0000 (07:58 -0700)
commit4ba25a496f62129a2ad8c2436ab2b402752dc66c
tree8abf41a79f293832a430a9609530c24cd365466c
parent390de835b61228abf6646f2b14530edca8d7512f
parent6e4664525b1db28f8c4e1130957f70a94c19213e
Merge tag 'v3.11' into next

Merge with mainline to bring in sync changes to cyttsp4 driver.
MAINTAINERS
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/cyttsp4_core.c
drivers/tty/sysrq.c
include/uapi/linux/input.h