Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
authorPaul Mackerras <paulus@samba.org>
Sun, 29 Jun 2008 23:57:05 +0000 (09:57 +1000)
committerPaul Mackerras <paulus@samba.org>
Sun, 29 Jun 2008 23:57:05 +0000 (09:57 +1000)

Trivial merge