Merge tag 'v3.15-rc5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 14 May 2014 23:49:19 +0000 (16:49 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 14 May 2014 23:49:19 +0000 (16:49 -0700)
commit879f99ef2c4c05d9a7f0a67a05f1415663119825
tree0399664761f675eef741f8b08b92635069586151
parent70a26071f8552a0f193cf442f424decfe0f2e569
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c
Merge tag 'v3.15-rc5' into next

Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
drivers/input/evdev.c
drivers/input/misc/Kconfig
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/ads7846.c