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

# Conflicts:
#	arch/x86/mm/Makefile
#	fs/nfs/file.c
#	include/linux/slab.h
#	mm/page_io.c