Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.

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

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/mempolicy.c
Simple merge

diff --cc mm/migrate.c
Simple merge

diff --cc mm/mmap.c
Simple merge