Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Mon, 13 Feb 2012 00:18:29 +0000 (18:18 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Mon, 13 Feb 2012 00:18:29 +0000 (18:18 -0600)
commit9b6690a3c5fa823b9f16ef9dd6f2f63da81c220b
treeb8aeb3003ee1fbbbe0aaa4d3050a6ace06a2cb0b
parent7444d38d55829309a52b57da84c9bbe70fde4daa
parentedc9b4bf97bf1d6351423c6108610ad52056d5bc
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c