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

Trivial merge