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

Trivial merge