Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper11.(none)>
Thu, 8 Sep 2011 21:47:56 +0000 (14:47 -0700)
committerYanhua Sun <sun51@hopper11.(none)>
Thu, 8 Sep 2011 21:47:56 +0000 (14:47 -0700)
1  2 
src/arch/gemini_gni/machine.c

Simple merge