Merge branch 'akpm' (Fixups for Andrew's patchbomb)