Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 20:28:47 +0000 (13:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 20:28:47 +0000 (13:28 -0700)

Trivial merge