Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
authorPaul Mackerras <paulus@samba.org>
Mon, 24 Nov 2008 00:53:44 +0000 (11:53 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 24 Nov 2008 00:53:44 +0000 (11:53 +1100)

Trivial merge