Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 06:18:10 +0000 (23:18 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 06:18:10 +0000 (23:18 -0700)

Trivial merge