Merge branch 'akpm' (patchbomb from Andrew)