Merge branch 'akpm' (Andrew's incoming - part two)