Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 21:12:41 +0000 (13:12 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 21:12:41 +0000 (13:12 -0800)

Trivial merge