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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: xen-kbdfront - fix mouse getting stuck after save/restore
  Input: estimate number of events per packet
  Input: evdev - indicate buffer overrun with SYN_DROPPED
  Input: document event types and codes and their intended use
  Input: add KEY_IMAGES specifically for AL Image Browser
  Input: twl4030_keypad - fix potential NULL dereference in twl4030_kp_probe()
  Input: h3600_ts - fix error handling at connect
  Input: twl4030_keypad - avoid potential NULL-pointer dereference

diff --combined include/linux/input.h
index f3a7794,73a8c6e..771d6d8
--- 1/include/linux/input.h
--- 2/include/linux/input.h
+++ b/include/linux/input.h
@@@ -167,6 -167,7 +167,7 @@@ struct input_keymap_entry 
  #define SYN_REPORT            0
  #define SYN_CONFIG            1
  #define SYN_MT_REPORT         2
+ #define SYN_DROPPED           3
  
  /*
   * Keys and buttons
@@@ -553,8 -554,8 +554,8 @@@
  #define KEY_DVD                       0x185   /* Media Select DVD */
  #define KEY_AUX                       0x186
  #define KEY_MP3                       0x187
- #define KEY_AUDIO             0x188
- #define KEY_VIDEO             0x189
+ #define KEY_AUDIO             0x188   /* AL Audio Browser */
+ #define KEY_VIDEO             0x189   /* AL Movie Browser */
  #define KEY_DIRECTORY         0x18a
  #define KEY_LIST              0x18b
  #define KEY_MEMO              0x18c   /* Media Select Messages */
@@@ -603,8 -604,9 +604,9 @@@
  #define KEY_FRAMEFORWARD      0x1b5
  #define KEY_CONTEXT_MENU      0x1b6   /* GenDesc - system context menu */
  #define KEY_MEDIA_REPEAT      0x1b7   /* Consumer - transport control */
- #define KEY_10CHANNELSUP        0x1b8   /* 10 channels up (10+) */
- #define KEY_10CHANNELSDOWN      0x1b9   /* 10 channels down (10-) */
+ #define KEY_10CHANNELSUP      0x1b8   /* 10 channels up (10+) */
+ #define KEY_10CHANNELSDOWN    0x1b9   /* 10 channels down (10-) */
+ #define KEY_IMAGES            0x1ba   /* AL Image Browser */
  
  #define KEY_DEL_EOL           0x1c0
  #define KEY_DEL_EOS           0x1c1
@@@ -664,13 -666,6 +666,13 @@@
  #define KEY_TOUCHPAD_ON               0x213
  #define KEY_TOUCHPAD_OFF      0x214
  
 +#define KEY_CAMERA_ZOOMIN     0x215
 +#define KEY_CAMERA_ZOOMOUT    0x216
 +#define KEY_CAMERA_UP         0x217
 +#define KEY_CAMERA_DOWN               0x218
 +#define KEY_CAMERA_LEFT               0x219
 +#define KEY_CAMERA_RIGHT      0x21a
 +
  #define BTN_TRIGGER_HAPPY             0x2c0
  #define BTN_TRIGGER_HAPPY1            0x2c0
  #define BTN_TRIGGER_HAPPY2            0x2c1