Merge branch 'akpm' (rest of patches from Andrew)