diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 01:41:27 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-15 01:41:27 -0400 |
| commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 (patch) | |
| tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 /include/linux/param.h | |
| parent | b70936d9ffbf0f45f4fa13a03122f015f13ecdb0 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
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>
Diffstat (limited to 'include/linux/param.h')
| -rw-r--r-- | include/linux/param.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/param.h b/include/linux/param.h deleted file mode 100644 index 092e92f67b50..000000000000 --- a/include/linux/param.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef _LINUX_PARAM_H | ||
| 2 | #define _LINUX_PARAM_H | ||
| 3 | |||
| 4 | #include <asm/param.h> | ||
| 5 | |||
| 6 | #endif | ||