diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2013-07-23 11:48:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-23 11:48:17 +0200 |
| commit | b59f2b4d30c187160df597bae41cabe497b6acf4 (patch) | |
| tree | e29ed9e3cbaf777cc1a10c99c4542985002d2c88 /kernel/sysctl_binary.c | |
| parent | mutex: Fix/document access-once assumption in mutex_can_spin_on_owner() (diff) | |
| parent | Linux 3.11-rc2 (diff) | |
| download | wireguard-linux-b59f2b4d30c187160df597bae41cabe497b6acf4.tar.xz wireguard-linux-b59f2b4d30c187160df597bae41cabe497b6acf4.zip | |
Merge tag 'v3.11-rc2' into core/locking
Merge in Linux 3.11-rc2 before moving on with new work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index aea4a9ea6fc8..b609213ca9a2 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c @@ -3,7 +3,6 @@ #include "../fs/xfs/xfs_sysctl.h" #include <linux/sunrpc/debug.h> #include <linux/string.h> -#include <net/ip_vs.h> #include <linux/syscalls.h> #include <linux/namei.h> #include <linux/mount.h> |