Merge branch 'akpm' (incoming fixes from Andrew)