Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 21 May 2005 00:21:03 +0000 (17:21 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 21 May 2005 00:21:03 +0000 (17:21 -0700)
commit9636273dae265b9354b861b373cd43cd76a6d0fe
treecfdcf2133f1846c6f18e21f2a74fc267b8302c3b
parent2df9fa36643f03b0462b170515c1e221c3709fa9
parent2bf2c568c878b9c0bbacac5c3210a6bd81856d21
Merge ... parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git