Merge branch 'akpm' (incoming from Andrew)