Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
authorPaul Mackerras <paulus@samba.org>
Wed, 30 Jan 2008 23:50:17 +0000 (10:50 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 30 Jan 2008 23:50:17 +0000 (10:50 +1100)

Trivial merge