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

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 mm/filemap.c
Simple merge

diff --cc mm/internal.h
Simple merge

diff --cc mm/mmap.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