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

# Conflicts:
#	kernel/rcu/rcu.h
#	kernel/trace/ftrace.c