Merge branch 'akpm' (more patches from Andrew)