Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Dec 2005 23:09:50 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Dec 2005 23:09:50 +0000 (15:09 -0800)

Trivial merge