Merge branch 'akpm' (patches from Andrew)