Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

# Conflicts:
#	include/linux/ptrace.h