Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Linus Torvalds [Fri, 18 Nov 2005 15:22:51 +0000 (07:22 -0800)]

Trivial merge