Please pull from 'for-2.6.25' branch

[Paul Mackerras]

Kumar Gala writes:

> These are fixes to forward on to linus (based on his tree).

Are you going to put in the fix for swap on 8xx in arch/ppc?

Paul.