Merge branch 'akpm' (more incoming from Andrew)