Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 10 Aug 2005 16:36:02 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 10 Aug 2005 16:36:02 +0000 (09:36 -0700)

Trivial merge