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

Pull input subsystem fixes from Dmitry Torokhov:
 "A fix for ALPS driver for issue introduced in the latest update and a
  tweak for yet another Lenovo box in Synaptics.

  There will be more ALPS tweaks coming.."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: define INPUT_PROP_ACCELEROMETER behavior
  Input: synaptics - fix min-max quirk value for E440
  Input: synaptics - add quirk for Thinkpad E440
  Input: ALPS - fix max coordinates for v5 and v7 protocols
  Input: add MT_TOOL_PALM

diff --combined include/uapi/linux/input.h
index b0a8130,2320b0c..2f62ab2
--- 1/include/uapi/linux/input.h
--- 2/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@@ -166,7 -166,6 +166,7 @@@ struct input_keymap_entry 
  #define INPUT_PROP_SEMI_MT            0x03    /* touch rectangle only */
  #define INPUT_PROP_TOPBUTTONPAD               0x04    /* softbuttons at top of pad */
  #define INPUT_PROP_POINTING_STICK     0x05    /* is a pointing stick */
 +#define INPUT_PROP_ACCELEROMETER      0x06    /* has accelerometer */
  
  #define INPUT_PROP_MAX                        0x1f
  #define INPUT_PROP_CNT                        (INPUT_PROP_MAX + 1)
@@@ -973,7 -972,8 +973,8 @@@
   */
  #define MT_TOOL_FINGER                0
  #define MT_TOOL_PEN           1
- #define MT_TOOL_MAX           1
+ #define MT_TOOL_PALM          2
+ #define MT_TOOL_MAX           2
  
  /*
   * Values describing the status of a force-feedback effect