Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 18:31:35 +0000 (10:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 18:31:35 +0000 (10:31 -0800)

Trivial merge