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 00:11:29 +0000 (17:11 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 30 Aug 2005 00:11:29 +0000 (17:11 -0700)

Trivial merge