Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 15 Dec 2005 02:40:02 +0000 (18:40 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 15 Dec 2005 02:40:02 +0000 (18:40 -0800)
commita50e2cc7c8e2b9b38f5972bc19daea4c98878d01
treede134372fa3982479962b384495064d38ea2bede
parentc7868048a7314bb4a2973097d605f00acd3b70bd
parentc9526497cf03ee775c3a6f8ba62335735f98de7a
Merge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
drivers/scsi/scsi_lib.c