| commit | af9484a2a8a88ad68c23a509b713646dda4c740b | [log] [tgz] |
|---|---|---|
| author | Li-Ta Lo <ollie@lanl.gov> | Mon Mar 20 21:18:53 2006 +0000 |
| committer | Li-Ta Lo <ollie@lanl.gov> | Mon Mar 20 21:18:53 2006 +0000 |
| tree | 141e50584955815eef2b78e48563487c6f4e8bfe | |
| parent | db44be9405ae4b62b525fb7dad80e20c499cc07b [diff] |
resolve conflict git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2219 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1