diff options
author | Ronald G. Minnich <rminnich@gmail.com> | 2006-03-20 22:20:09 +0000 |
---|---|---|
committer | Ronald G. Minnich <rminnich@gmail.com> | 2006-03-20 22:20:09 +0000 |
commit | 316ea53e291f1f1526b7877075383052e09e3981 (patch) | |
tree | 3530db9c3c0dccfa9bc4ef2020e3d6656e831022 /src/cpu | |
parent | a11e6cfd9232d7db4e30d645e6545f5ea1851bb1 (diff) |
fix conflich
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2221 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
0 files changed, 0 insertions, 0 deletions