Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 18:03:44 +0000 (10:03 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 18:03:44 +0000 (10:03 -0800)

Trivial merge