Merge tag 'v3.13-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 16 Dec 2013 10:04:49 +0000 (02:04 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 16 Dec 2013 10:04:49 +0000 (02:04 -0800)
commit348324c5b10bcba8d9daabdfb85a6927311be34f
treed06ca3a264407a14a1f36c1b798d6dc0dc1582d8
parent1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0
parent319e2e3f63c348a9b66db4667efa73178e18b17d
Merge tag 'v3.13-rc4' into next

Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
arch/sh/boards/mach-ecovec24/setup.c
drivers/input/keyboard/adp5588-keys.c
drivers/input/keyboard/adp5589-keys.c
drivers/input/keyboard/bf54x-keys.c
drivers/input/misc/adxl34x.c
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/cyttsp_core.c