Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 18 May 2005 23:37:46 +0000 (16:37 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 18 May 2005 23:37:46 +0000 (16:37 -0700)

Trivial merge