Merge commit 'v3.7-rc1' into stable/for-linus-3.7

* commit 'v3.7-rc1': (10892 commits)
  Linux 3.7-rc1
  x86, boot: Explicitly include autoconf.h for hostprogs
  perf: Fix UAPI fallout
  ARM: config: make sure that platforms are ordered by option string
  ARM: config: sort select statements alphanumerically
  UAPI: (Scripted) Disintegrate include/linux/byteorder
  UAPI: (Scripted) Disintegrate include/linux
  UAPI: Unexport linux/blk_types.h
  UAPI: Unexport part of linux/ppp-comp.h
  perf: Handle new rbtree implementation
  procfs: don't need a PATH_MAX allocation to hold a string representation of an int
  vfs: embed struct filename inside of names_cache allocation if possible
  audit: make audit_inode take struct filename
  vfs: make path_openat take a struct filename pointer
  vfs: turn do_path_lookup into wrapper around struct filename variant
  audit: allow audit code to satisfy getname requests from its names_list
  vfs: define struct filename and have getname() return it
  btrfs: Fix compilation with user namespace support enabled
  userns: Fix posix_acl_file_xattr_userns gid conversion
  userns: Properly print bluetooth socket uids
  ...

1 files changed, 80 insertions, 0 deletions

diff --git a/include/uapi/linux/serio.h b/include/uapi/linux/serio.h
new file mode 100644
index 000000000000..9f53fa7fc132
--- /dev/null
+++ b/include/uapi/linux/serio.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 1999-2002 Vojtech Pavlik
+*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef _UAPI_SERIO_H
+#define _UAPI_SERIO_H
+
+
+#include <linux/ioctl.h>
+
+#define SPIOCSTYPE      _IOW('q', 0x01, unsigned long)
+
+
+/*
+ * bit masks for use in "interrupt" flags (3rd argument)
+ */
+#define SERIO_TIMEOUT   1
+#define SERIO_PARITY    2
+#define SERIO_FRAME     4
+
+/*
+ * Serio types
+ */
+#define SERIO_XT        0x00
+#define SERIO_8042      0x01
+#define SERIO_RS232     0x02
+#define SERIO_HIL_MLC   0x03
+#define SERIO_PS_PSTHRU 0x05
+#define SERIO_8042_XL   0x06
+
+/*
+ * Serio protocols
+ */
+#define SERIO_UNKNOWN   0x00
+#define SERIO_MSC       0x01
+#define SERIO_SUN       0x02
+#define SERIO_MS        0x03
+#define SERIO_MP        0x04
+#define SERIO_MZ        0x05
+#define SERIO_MZP       0x06
+#define SERIO_MZPP      0x07
+#define SERIO_VSXXXAA   0x08
+#define SERIO_SUNKBD    0x10
+#define SERIO_WARRIOR   0x18
+#define SERIO_SPACEORB  0x19
+#define SERIO_MAGELLAN  0x1a
+#define SERIO_SPACEBALL 0x1b
+#define SERIO_GUNZE     0x1c
+#define SERIO_IFORCE    0x1d
+#define SERIO_STINGER   0x1e
+#define SERIO_NEWTON    0x1f
+#define SERIO_STOWAWAY  0x20
+#define SERIO_H3600     0x21
+#define SERIO_PS2SER    0x22
+#define SERIO_TWIDKBD   0x23
+#define SERIO_TWIDJOY   0x24
+#define SERIO_HIL       0x25
+#define SERIO_SNES232   0x26
+#define SERIO_SEMTECH   0x27
+#define SERIO_LKKBD     0x28
+#define SERIO_ELO       0x29
+#define SERIO_MICROTOUCH        0x30
+#define SERIO_PENMOUNT  0x31
+#define SERIO_TOUCHRIGHT        0x32
+#define SERIO_TOUCHWIN  0x33
+#define SERIO_TAOSEVM   0x34
+#define SERIO_FUJITSU   0x35
+#define SERIO_ZHENHUA   0x36
+#define SERIO_INEXIO    0x37
+#define SERIO_TOUCHIT213        0x38
+#define SERIO_W8001     0x39
+#define SERIO_DYNAPRO   0x3a
+#define SERIO_HAMPSHIRE 0x3b
+#define SERIO_PS2MULT   0x3c
+#define SERIO_TSC40     0x3d
+
+#endif /* _UAPI_SERIO_H */