Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 18:22:04 +0000 (10:22 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Mar 2006 18:22:04 +0000 (10:22 -0800)

Trivial merge