Merge commit 'v3.2-rc3' into next

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

diff --cc drivers/input/misc/adxl34x.c
Simple merge

diff --cc drivers/input/misc/ati_remote2.c
Simple merge

diff --cc drivers/input/mouse/elantech.c
index 59bfb70d330a03cd8cd8230e031319544309739c,e2a9867c19d52fce53cac578bdaf265d3211bba1..d2c0db159b18dfc364c2ff7fc036863ef2de9614
--- 1/drivers/input/mouse/elantech.c
--- 2/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@@ -1262,24 -1210,32 +1262,34 @@@ static int elantech_reconnect(struct ps
   */
  static int elantech_set_properties(struct elantech_data *etd)
  {
+       /* This represents the version of IC body. */
        int ver = (etd->fw_version & 0x0f0000) >> 16;
  
+       /* Early version of Elan touchpads doesn't obey the rule. */
        if (etd->fw_version < 0x020030 || etd->fw_version == 0x020600)
                etd->hw_version = 1;
-       else if (etd->fw_version < 0x150600)
-               etd->hw_version = 2;
-       else if (ver == 5)
-               etd->hw_version = 3;
-       else if (ver == 6)
-               etd->hw_version = 4;
-       else
-               return -1;
+       else {
+               switch (ver) {
+               case 2:
+               case 4:
+                       etd->hw_version = 2;
+                       break;
+               case 5:
+                       etd->hw_version = 3;
+                       break;
+               case 6:
+                       etd->hw_version = 4;
+                       break;
+               default:
+                       return -1;
+               }
+       }
  
 -      /*
 -       * Turn on packet checking by default.
 -       */
 +      /* decide which send_cmd we're gonna use early */
 +      etd->send_cmd = etd->hw_version >= 3 ? elantech_send_cmd :
 +                                             synaptics_send_cmd;
 +
 +      /* Turn on packet checking by default */
        etd->paritycheck = 1;
  
        /*

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

diff --cc drivers/input/tablet/wacom_wac.c
index 6b9adc7bec6ea5afa1ab1860de41222edf0216c8,da0d8761e778cfd8f79e64b26a0ce3acd8cf60c5..ecfcbc8144dca62757b105b5275e71f3b8371b64
--- 1/drivers/input/tablet/wacom_wac.c
--- 2/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@@ -799,15 -799,10 +799,13 @@@ static int wacom_bpt_touch(struct wacom
        unsigned char *data = wacom->data;
        int i;
  
 +      if (data[0] != 0x02)
 +          return 0;
 +
        for (i = 0; i < 2; i++) {
-               int p = data[9 * i + 2];
-               bool touch = p && !wacom->shared->stylus_in_proximity;
+               int offset = (data[1] & 0x80) ? (8 * i) : (9 * i);
+               bool touch = data[offset + 3] & 0x80;
  
-               input_mt_slot(input, i);
-               input_mt_report_slot_state(input, MT_TOOL_FINGER, touch);
                /*
                 * Touch events need to be disabled while stylus is
                 * in proximity because user's hand is resting on touchpad

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

diff --cc drivers/input/touchscreen/ad7879-spi.c
Simple merge

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

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