Merge tag 'v3.15-rc5' into next

Merge with Linux 3.15-rc5 to sync up Wacom and other changes.

diff --cc drivers/input/evdev.c
Simple merge

diff --cc drivers/input/misc/Kconfig
Simple merge

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

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