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

Trivial merge