Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl...

# Conflicts:
#	kernel/sysctl.c

diff --cc MAINTAINERS
Simple merge

diff --cc fs/coredump.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc include/linux/dcache.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/swap.h
Simple merge

diff --cc include/linux/vmstat.h
Simple merge

diff --cc kernel/sysctl.c
index 635f5e829fe884fa6c026b6de4d6457a7d2a2633,eeb4cba121903cab5c835fb46db0e893d200de0f..b65489f7fcf74bd1663e6fa0509695461d905f03
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -54,7 -47,7 +47,6 @@@
  #include <linux/acpi.h>
  #include <linux/reboot.h>
  #include <linux/ftrace.h>
- #include <linux/oom.h>
 -#include <linux/perf_event.h>
  #include <linux/kmod.h>
  #include <linux/capability.h>
  #include <linux/binfmts.h>

diff --cc mm/filemap.c
Simple merge

diff --cc mm/internal.h
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/nommu.c
Simple merge

diff --cc mm/swap.c
Simple merge

diff --cc mm/util.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc mm/vmstat.c
Simple merge