Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 6 May 2005 23:46:40 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 6 May 2005 23:46:40 +0000 (16:46 -0700)
commit07342d623b8e1ac9501a36a0da55cbce1117aeaf
tree611ac9c9a042ad5a5af247567091db9808ceb5ca
parentd4a1a7322c8c6b9899851f8358eb3842c67de6bc
parente4862fedbc37a2c242824b100101f8e6e8488748
Merge ... parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git