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