Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 15 Nov 2013 01:38:05 +0000 (17:38 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 15 Nov 2013 01:38:05 +0000 (17:38 -0800)
commit42249094f79422fbf5ed4b54eeb48ff096809b8f
tree91e6850c8c7e8cc284cf8bb6363f8662f84011f4
parent936816161978ca716a56c5e553c68f25972b1e3a
parent2c027b7c48a888ab173ba45babb4525e278375d9
Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.
drivers/input/input.c
drivers/input/keyboard/pxa27x_keypad.c
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c