tree 141e50584955815eef2b78e48563487c6f4e8bfe
parent db44be9405ae4b62b525fb7dad80e20c499cc07b
author Li-Ta Lo <ollie@lanl.gov> 1142889533 +0000
committer Li-Ta Lo <ollie@lanl.gov> 1142889533 +0000

resolve conflict

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2219 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1