Merge branch 'akpm' (final batch from Andrew)