Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 15 Mar 2012 20:04:00 +0000 (15:04 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 15 Mar 2012 20:04:00 +0000 (15:04 -0500)
1  2 
src/arch/gemini_gni/machine.c

Simple merge