Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...
authorPaul Mackerras <paulus@samba.org>
Fri, 18 Apr 2008 03:34:30 +0000 (13:34 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 18 Apr 2008 03:34:30 +0000 (13:34 +1000)

Trivial merge