Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Mon, 19 Mar 2012 07:11:22 +0000 (02:11 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Mon, 19 Mar 2012 07:11:22 +0000 (02:11 -0500)
commitc1a0f5fde700e63c8fb3da0cdf1af460c10e81b0
treecaebe96f38b5305ae1ed0c7e813c31d0d79959b2
parentc60ff6e1d5a05781128b19ba486fb25b68030728
parentc60639aeaa8ea093e484cb879a543efbffdd1f12
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c