solved the conflict
authorYanhua Sun <sun51@hopper02.(none)>
Tue, 9 Aug 2011 17:05:21 +0000 (10:05 -0700)
committerYanhua Sun <sun51@hopper02.(none)>
Tue, 9 Aug 2011 17:05:21 +0000 (10:05 -0700)
commit0aea892c9bad2ae59678d2efcf6349dded591745
tree96d85b9b18d919e886420c42c41f8130afb48b23
parentea54a100ac1d22ecd5fc896dff44c03d93aa5957
solved the conflict
src/arch/gemini_gni/machine.c
tests/converse/commbench/commbench.c
tests/converse/commbench/pingpong.c
tests/converse/megacon/megacon.c
tests/converse/megacon/ringsimple.c