diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-14 20:14:01 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-10-14 20:14:01 -0400 |
| commit | 07aaae44f5a3962c3a410a6dd7936dfa7dece2b9 (patch) | |
| tree | 0cdb5735800ddd63d8850aa26d3a3f1f3334267a /kernel/sysctl_binary.c | |
| parent | 07a062140372187642003e02a49edc8a2115c1ca (diff) | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
Merge commit 'v3.1-rc9' into fbdev-next
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 3b8e028b9601..e8bffbe2ba4b 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include <linux/stat.h> | 1 | #include <linux/stat.h> |
| 2 | #include <linux/sysctl.h> | 2 | #include <linux/sysctl.h> |
| 3 | #include "../fs/xfs/linux-2.6/xfs_sysctl.h" | 3 | #include "../fs/xfs/xfs_sysctl.h" |
| 4 | #include <linux/sunrpc/debug.h> | 4 | #include <linux/sunrpc/debug.h> |
| 5 | #include <linux/string.h> | 5 | #include <linux/string.h> |
| 6 | #include <net/ip_vs.h> | 6 | #include <net/ip_vs.h> |