Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 3 insertions, 0 deletions

diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index d584047b072b..a3726275876d 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -152,6 +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 */
 
@@ -194,6 +195,8 @@ struct input_keymap_entry {
 #define SYN_CONFIG              1
 #define SYN_MT_REPORT           2
 #define SYN_DROPPED             3
+#define SYN_MAX                 0xf
+#define SYN_CNT                 (SYN_MAX+1)
 
 /*
  * Keys and buttons