Merge branch 'akpm' (Andrew's patch-bomb)