Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Dec 2005 22:32:44 +0000 (14:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Dec 2005 22:32:44 +0000 (14:32 -0800)

Trivial merge