Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 23:00:33 +0000 (16:00 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 23:00:33 +0000 (16:00 -0700)

Trivial merge