Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 Aug 2005 04:44:33 +0000 (21:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 Aug 2005 04:44:33 +0000 (21:44 -0700)

Trivial merge