Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 04:32:13 +0000 (20:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 04:32:13 +0000 (20:32 -0800)

Trivial merge