Merge branch 'akpm' (second patchbomb from Andrew Morton)