Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorPaul Mackerras <paulus@samba.org>
Tue, 7 Feb 2006 22:43:08 +0000 (09:43 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 7 Feb 2006 22:43:08 +0000 (09:43 +1100)

Trivial merge