Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <[email protected]>
Sat, 5 Nov 2005 00:27:50 +0000 (16:27 -0800)
committerLinus Torvalds <[email protected]>
Sat, 5 Nov 2005 00:27:50 +0000 (16:27 -0800)

Trivial merge