Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 22 Dec 2005 17:34:05 +0000 (09:34 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 22 Dec 2005 17:34:05 +0000 (09:34 -0800)

Trivial merge