Merge branch 'next' into for-linus

Prepare first round of input updates for 3.17.

diff --cc drivers/hid/wacom_wac.c
index e73cf2c71f355993c564cee0a05b7cbd34e5f435,d4a2d533a444dd5c78b4cf2b834419b61dc9127d..aa6a08eb7ad686ced04e04fffee1561cde6da533
--- 1/drivers/input/tablet/wacom_wac.c
--- 2/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@@ -1871,12 -1943,11 +1937,7 @@@ int wacom_setup_input_capabilities(stru
  
                if (features->device_type == BTN_TOOL_FINGER) {
  
-                       __set_bit(BTN_LEFT, input_dev->keybit);
-                       __set_bit(BTN_FORWARD, input_dev->keybit);
-                       __set_bit(BTN_BACK, input_dev->keybit);
-                       __set_bit(BTN_RIGHT, input_dev->keybit);
- 
                        if (features->touch_max) {
 -                              /* touch interface */
 -                              unsigned int flags = INPUT_MT_POINTER;
 -
 -                              __set_bit(INPUT_PROP_POINTER, input_dev->propbit);
                                if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {
                                        input_set_abs_params(input_dev,
                                                     ABS_MT_TOUCH_MAJOR,