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)
1  2 
src/arch/gemini_gni/machine.c

Simple merge