Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "A few quirks for the Elan touchpad driver, another Thinkpad is being
  switched over from PS/2 to native RMI4 interface, and we gave a brand
  new SW_MACHINE_COVER switch definition"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - add more hardware ID for Lenovo laptops
  Input: i8042 - add Lenovo XiaoXin Air 12 to i8042 nomux list
  Revert "Input: elants_i2c - report resolution information for touch major"
  Input: elan_i2c - only increment wakeup count on touch
  Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen
  ARM: dts: n900: remove mmc1 card detect gpio
  Input: add `SW_MACHINE_COVER`

diff --combined include/linux/mod_devicetable.h
index 8d764aa,04a19e3..e14cbe4
--- 1/include/linux/mod_devicetable.h
--- 2/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@@ -318,7 -318,7 +318,7 @@@ struct pcmcia_device_id 
  #define INPUT_DEVICE_ID_LED_MAX               0x0f
  #define INPUT_DEVICE_ID_SND_MAX               0x07
  #define INPUT_DEVICE_ID_FF_MAX                0x7f
- #define INPUT_DEVICE_ID_SW_MAX                0x0f
+ #define INPUT_DEVICE_ID_SW_MAX                0x10
  #define INPUT_DEVICE_ID_PROP_MAX      0x1f
  
  #define INPUT_DEVICE_ID_MATCH_BUS     1
@@@ -434,7 -434,7 +434,7 @@@ struct virtio_device_id 
   * For Hyper-V devices we use the device guid as the id.
   */
  struct hv_vmbus_device_id {
 -      uuid_le guid;
 +      guid_t guid;
        kernel_ulong_t driver_data;     /* Data private to the driver */
  };
  
@@@ -532,8 -532,6 +532,8 @@@ enum dmi_field 
        DMI_BIOS_VENDOR,
        DMI_BIOS_VERSION,
        DMI_BIOS_DATE,
 +      DMI_BIOS_RELEASE,
 +      DMI_EC_FIRMWARE_RELEASE,
        DMI_SYS_VENDOR,
        DMI_PRODUCT_NAME,
        DMI_PRODUCT_VERSION,
@@@ -665,16 -663,16 +665,16 @@@ struct x86_cpu_id 
        __u16 vendor;
        __u16 family;
        __u16 model;
 +      __u16 steppings;
        __u16 feature;  /* bit index */
        kernel_ulong_t driver_data;
  };
  
 -#define X86_FEATURE_MATCH(x) \
 -      { X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, x }
 -
 +/* Wild cards for x86_cpu_id::vendor, family, model and feature */
  #define X86_VENDOR_ANY 0xffff
  #define X86_FAMILY_ANY 0
  #define X86_MODEL_ANY  0
 +#define X86_STEPPING_ANY 0
  #define X86_FEATURE_ANY 0     /* Same as FPU, you can't test for that */
  
  /*
@@@ -823,17 -821,4 +823,17 @@@ struct wmi_device_id 
        const void *context;
  };
  
 +#define MHI_DEVICE_MODALIAS_FMT "mhi:%s"
 +#define MHI_NAME_SIZE 32
 +
 +/**
 + * struct mhi_device_id - MHI device identification
 + * @chan: MHI channel name
 + * @driver_data: driver data;
 + */
 +struct mhi_device_id {
 +      const char chan[MHI_NAME_SIZE];
 +      kernel_ulong_t driver_data;
 +};
 +
  #endif /* LINUX_MOD_DEVICETABLE_H */