Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 05:24:55 +0000 (21:24 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 14 Jan 2006 05:24:55 +0000 (21:24 -0800)

Trivial merge