Merge branch 'for-2.6.26' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
authorPaul Mackerras <paulus@samba.org>
Thu, 3 Jul 2008 00:05:59 +0000 (10:05 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 3 Jul 2008 00:05:59 +0000 (10:05 +1000)

Trivial merge