Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx