Merge branch 'akpm-incoming-1'