Merge branch 'mm-stable' into j