Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Linus Torvalds [Sat, 14 Jan 2006 05:24:55 +0000 (21:24 -0800)]

Trivial merge