Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	include/linux/serial_sci.h

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 997080f00e0b..d24f761f4876 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1471,12 +1471,12 @@ static struct ctl_table fs_table[] = {
         },
 #endif
         {
-                .procname       = "pipe-max-pages",
-                .data           = &pipe_max_pages,
+                .procname       = "pipe-max-size",
+                .data           = &pipe_max_size,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .extra1         = &two,
+                .proc_handler   = &pipe_proc_fn,
+                .extra1         = &pipe_min_size,
         },
 /*
  * NOTE: do not add new entries to this table unless you have read