Merge branch 'akpm' (Andrew's incoming)