| commit | 3afa294c40013be5d8180005002e3f648d04d942 | [log] [tgz] |
|---|---|---|
| author | James Bottomley <jejb@titanic.(none)> | Fri Jun 17 19:04:18 2005 -0500 |
| committer | James Bottomley <jejb@titanic.(none)> | Fri Jun 17 19:04:18 2005 -0500 |
| tree | 8a8b7464fd8ee4901288afb3e9e8d761ef45647d | |
| parent | a1541d5af66d02426655b1498f814c52347dd7d3 [diff] | |
| parent | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 [diff] |
merge by hand (qla_os.c mismerge)