Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 16:04:36 +0000 (09:04 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 30 Jun 2005 16:04:36 +0000 (09:04 -0700)

Trivial merge