Merge branch 'mm-hotfixes-stable' into mm-nonmm-stable to pick up changes required to merge "kho: use unsigned long for nr_pages".


Author Andrew Morton Date Commit Parent 6ca9de36