Merge branch 'akpm' (updates from Andrew Morton)