Merge branch 'akpm' (Andrew's patchbomb)