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

Pull input update from Dmitry Torokhov:
 "The only change is David Hermann's new EVIOCREVOKE evdev ioctl that
  allows safely passing file descriptors to input devices to session
  processes and later being able to stop delivery of events through
  these fds so that inactive sessions will no longer receive user input
  that does not belong to them"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: evdev - add EVIOCREVOKE ioctl

diff --combined include/uapi/linux/input.h
index d08abf9,d61c61c..a372627
--- 1/include/uapi/linux/input.h
--- 2/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@@ -152,6 -152,7 +152,7 @@@ struct input_keymap_entry 
  #define EVIOCGEFFECTS         _IOR('E', 0x84, int)                    /* Report number of effects playable at the same time */
  
  #define EVIOCGRAB             _IOW('E', 0x90, int)                    /* Grab/Release device */
+ #define EVIOCREVOKE           _IOW('E', 0x91, int)                    /* Revoke device access */
  
  #define EVIOCSCLOCKID         _IOW('E', 0xa0, int)                    /* Set clockid to be used for timestamps */
  
@@@ -508,15 -509,11 +509,15 @@@
  #define BTN_DEAD              0x12f
  
  #define BTN_GAMEPAD           0x130
 -#define BTN_A                 0x130
 -#define BTN_B                 0x131
 +#define BTN_SOUTH             0x130
 +#define BTN_A                 BTN_SOUTH
 +#define BTN_EAST              0x131
 +#define BTN_B                 BTN_EAST
  #define BTN_C                 0x132
 -#define BTN_X                 0x133
 -#define BTN_Y                 0x134
 +#define BTN_NORTH             0x133
 +#define BTN_X                 BTN_NORTH
 +#define BTN_WEST              0x134
 +#define BTN_Y                 BTN_WEST
  #define BTN_Z                 0x135
  #define BTN_TL                        0x136
  #define BTN_TR                        0x137
@@@ -713,11 -710,6 +714,11 @@@
  #define KEY_ATTENDANT_TOGGLE  0x21d   /* Attendant call on or off */
  #define KEY_LIGHTS_TOGGLE     0x21e   /* Reading light on or off */
  
 +#define BTN_DPAD_UP           0x220
 +#define BTN_DPAD_DOWN         0x221
 +#define BTN_DPAD_LEFT         0x222
 +#define BTN_DPAD_RIGHT                0x223
 +
  #define BTN_TRIGGER_HAPPY             0x2c0
  #define BTN_TRIGGER_HAPPY1            0x2c0
  #define BTN_TRIGGER_HAPPY2            0x2c1