| commit | 042f0430d3905786620b3e74ffb8d48ea551b20c | [log] [tgz] |
|---|---|---|
| author | Li-Ta Lo <ollie@lanl.gov> | Fri Mar 17 20:11:38 2006 +0000 |
| committer | Li-Ta Lo <ollie@lanl.gov> | Fri Mar 17 20:11:38 2006 +0000 |
| tree | 5782f93631808b9c19adc4a457e527895cfe13f6 | |
| parent | a5ce2341ec04f333297cef729892cf886710ea89 [diff] |
resolving conflict with Ron's work git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2209 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1