Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...
authorPaul Mackerras <paulus@samba.org>
Fri, 2 May 2008 04:45:50 +0000 (14:45 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 2 May 2008 04:45:50 +0000 (14:45 +1000)

Trivial merge