Merge 3.7-rc1 into tty-linus

This syncs up the tty-linus branch to the latest in Linus's tree to get all of
the UAPI stuff needed for the next set of patches to merge.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 0 insertions, 24 deletions

diff --git a/include/linux/const.h b/include/linux/const.h
deleted file mode 100644
index c22c707c455d..000000000000
--- a/include/linux/const.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* const.h: Macros for dealing with constants.  */
-
-#ifndef _LINUX_CONST_H
-#define _LINUX_CONST_H
-
-/* Some constant macros are used in both assembler and
- * C code.  Therefore we cannot annotate them always with
- * 'UL' and other type specifiers unilaterally.  We
- * use the following macros to deal with this.
- *
- * Similarly, _AT() will cast an expression with a type in C, but
- * leave it unchanged in asm.
- */
-
-#ifdef __ASSEMBLY__
-#define _AC(X,Y)        X
-#define _AT(T,X)        X
-#else
-#define __AC(X,Y)       (X##Y)
-#define _AC(X,Y)        __AC(X,Y)
-#define _AT(T,X)        ((T)(X))
-#endif
-
-#endif /* !(_LINUX_CONST_H) */