Merge branch 'akpm' (patch-bomb from Andrew Morton)