| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 | [log] [tgz] |
|---|---|---|
| author | James Bottomley <jejb@titanic.(none)> | Fri Jun 17 18:42:23 2005 -0500 |
| committer | James Bottomley <jejb@titanic.(none)> | Fri Jun 17 18:42:23 2005 -0500 |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab [diff] | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 [diff] |
merge by hand (fix up qla_os.c merge error)