Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
authorLinus Torvalds <[email protected]>
Tue, 28 Feb 2006 15:38:21 +0000 (07:38 -0800)
committerLinus Torvalds <[email protected]>
Tue, 28 Feb 2006 15:38:21 +0000 (07:38 -0800)

Trivial merge