Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper05.(none)>
Tue, 7 Feb 2012 21:20:39 +0000 (13:20 -0800)
committerYanhua Sun <sun51@hopper05.(none)>
Tue, 7 Feb 2012 21:20:39 +0000 (13:20 -0800)
1  2 
src/arch/gemini_gni/machine.c

Simple merge