Merge branch 'akpm-incoming-2'