Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4...

Conflicts:
	drivers/hid/wacom_wac.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-lenovo.c
Simple merge

diff --cc drivers/hid/hid-rmi.c
Simple merge

diff --cc drivers/hid/i2c-hid/i2c-hid.c
Simple merge

diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge

diff --cc drivers/hid/wacom_wac.c
index adf959dcfa5df9da7bca7414e2d4ac74a35e1457,adf959dcfa5df9da7bca7414e2d4ac74a35e1457,fa54d329065945bade5b9048df9cb5a98c0bf7f2,adf959dcfa5df9da7bca7414e2d4ac74a35e1457,adf959dcfa5df9da7bca7414e2d4ac74a35e1457,fa54d329065945bade5b9048df9cb5a98c0bf7f2,fa54d329065945bade5b9048df9cb5a98c0bf7f2,fa54d329065945bade5b9048df9cb5a98c0bf7f2,d811e878a1058f0b52348bf17ea9866464a04b4a..232da89f4e886fe02b82d452c1a0868f0b65b967
--- 1/drivers/hid/wacom_wac.c
--- 2/drivers/hid/wacom_wac.c
--- 3/drivers/hid/wacom_wac.c
--- 4/drivers/hid/wacom_wac.c
--- 5/drivers/hid/wacom_wac.c
--- 6/drivers/hid/wacom_wac.c
--- 7/drivers/hid/wacom_wac.c
--- 8/drivers/hid/wacom_wac.c
--- 9/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@@@@@@@@@ -1072,12 -1072,12 -1072,9 -1072,12 -1072,12 -1072,9 -1072,9 -1072,9 -1072,8 +1072,11 @@@@@@@@@@ static int wacom_wac_finger_count_touch
                int count = 0;
                int i;
         
  -  ---        /* non-HID_GENERIC single touch input doesn't call this routine */
  -  ---        if ((touch_max == 1) && (wacom->features.type == HID_GENERIC))
  -  ---                return wacom->hid_data.tipswitch &&
  +  ++++       if (!touch_max)
  +  ++++               return 0;
  +  ++++
-- --           /* non-HID_GENERIC single touch input doesn't call this routine */
-- --           if ((touch_max == 1) && (wacom->features.type == HID_GENERIC))
-- --                   return wacom->hid_data.tipswitch &&
++++++++        if (touch_max == 1)
++++++++                return test_bit(BTN_TOUCH, input->key) &&
                               !wacom->shared->stylus_in_proximity;
         
                for (i = 0; i < input->mt->num_slots; i++) {