Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 30 Nov 2005 04:17:08 +0000 (20:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 30 Nov 2005 04:17:08 +0000 (20:17 -0800)

Trivial merge