Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 18:31:35 +0000 (10:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 18:31:35 +0000 (10:31 -0800)
commitfecb4a0c87c2bcaee1f3cf800126eef752a07ed3
tree32fbc17daf7879a9a86eb029096994be45cd136b
parenta2c78f7c1d393d89240ed5922d3aa8e439aec82e
parent39b7f1e25a412b0ef31e516cfc2fa4f40235f263
Merge /linux/kernel/git/jejb/scsi-for-linus-2.6