Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 11 Jan 2006 16:16:57 +0000 (08:16 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 11 Jan 2006 16:16:57 +0000 (08:16 -0800)

Trivial merge