Merge by hand (conflicts in sr.c)
authorJames Bottomley <jejb@titanic.(none)>
Sun, 28 Aug 2005 16:40:00 +0000 (11:40 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Sun, 28 Aug 2005 16:40:00 +0000 (11:40 -0500)
commitba482ef4b16bad5172d2be693d4b2420b84c84e7
tree8da2f7f2e223a4ba4c64ef30daa7a2c6154f85d7
parente514385be2b355c1f3fc6385a98a6a0fc04235ae
parent51490c89f95b8581782e9baa855da166441852be
Merge by hand (conflicts in sr.c)
drivers/scsi/sr.c