Merge branch 'akpm' (Fixups from Andrew)