Merge branch 'for-linus' into next

Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.

diff --cc drivers/input/mouse/elan_i2c_core.c
index 4b6e2df,6291fb5..8a0f224
--- 1/drivers/input/mouse/elan_i2c_core.c
--- 2/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@@ -997,12 -951,13 +997,14 @@@ static void elan_report_absolute(struc
        u8 hover_info = packet[ETP_HOVER_INFO_OFFSET];
        bool contact_valid, hover_event;
  
 -      hover_event = hover_info & 0x40;
 -      for (i = 0; i < ETP_MAX_FINGERS; i++) {
 -              contact_valid = tp_info & (1U << (3 + i));
 -              elan_report_contact(data, i, contact_valid, finger_data);
+       pm_wakeup_event(&data->client->dev, 0);
+ 
 +      hover_event = hover_info & BIT(6);
  
 +      for (i = 0; i < ETP_MAX_FINGERS; i++) {
 +              contact_valid = tp_info & BIT(3 + i);
 +              elan_report_contact(data, i, contact_valid, high_precision,
 +                                  packet, finger_data);
                if (contact_valid)
                        finger_data += ETP_FINGER_DATA_LEN;
        }
@@@ -1063,14 -1019,9 +1066,12 @@@ static irqreturn_t elan_isr(int irq, vo
        if (error)
                goto out;
  
-       pm_wakeup_event(dev, 0);
- 
        switch (report[ETP_REPORT_ID_OFFSET]) {
        case ETP_REPORT_ID:
 -              elan_report_absolute(data, report);
 +              elan_report_absolute(data, report, false);
 +              break;
 +      case ETP_REPORT_ID2:
 +              elan_report_absolute(data, report, true);
                break;
        case ETP_TP_REPORT_ID:
                elan_report_trackpoint(data, report);

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

diff --cc include/linux/mod_devicetable.h
Simple merge