Merge branch 'akpm' (Andrew's fixups)