resolve conflict
authorYanhua Sun <sun51@hopper07.(none)>
Thu, 8 Mar 2012 23:07:18 +0000 (15:07 -0800)
committerYanhua Sun <sun51@hopper07.(none)>
Thu, 8 Mar 2012 23:07:18 +0000 (15:07 -0800)
commit55c9c7e79782bc53127268ad7aed8e7321a213e2
tree268f51faf717012de65d920f2a3cb8a324450d4c
parent43bf94bce562417549182b4d40122a187e1ced14
resolve conflict
src/arch/gemini_gni/machine.c