resolving conflict with Ron's work
authorLi-Ta Lo <ollie@lanl.gov>
Fri, 17 Mar 2006 20:11:38 +0000 (20:11 +0000)
committerLi-Ta Lo <ollie@lanl.gov>
Fri, 17 Mar 2006 20:11:38 +0000 (20:11 +0000)
commit042f0430d3905786620b3e74ffb8d48ea551b20c
tree5782f93631808b9c19adc4a457e527895cfe13f6
parenta5ce2341ec04f333297cef729892cf886710ea89
resolving conflict with Ron's work

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2209 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
src/mainboard/amd/rumba/Config.lb
src/mainboard/amd/rumba/auto.c
src/northbridge/amd/gx2/pll_reset.c
src/northbridge/amd/gx2/raminit.c
src/southbridge/amd/cs5535/cs5535_early_setup.c
src/southbridge/amd/cs5535/cs5535_early_smbus.c
src/southbridge/amd/cs5535/cs5535_smbus.h