Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 22 Mar 2012 01:18:54 +0000 (18:18 -0700)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 22 Mar 2012 01:18:54 +0000 (18:18 -0700)
1  2 
src/arch/gemini_gni/machine.c

Simple merge