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)
1  2 
drivers/scsi/scsi_lib.c

Simple merge