]> git.baikalelectronics.ru Git - kernel.git/commit
merge by hand (qla_os.c mismerge)
authorJames Bottomley <jejb@titanic.(none)>
Sat, 18 Jun 2005 00:04:18 +0000 (19:04 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Sat, 18 Jun 2005 00:04:18 +0000 (19:04 -0500)
commitb5194f928a2242e8546a04c5d49afc268c025d8d
tree8a8b7464fd8ee4901288afb3e9e8d761ef45647d
parent6199ab9f613874e9854ae5384eda0170687a7999
parent767ba63bd661de7ff6940189eebfd55b59f21941
merge by hand (qla_os.c mismerge)
drivers/scsi/qla2xxx/qla_os.c