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

Trivial merge