Merge branch 'akpm' (second patch-bomb from Andrew)