Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Fri, 29 Jul 2011 04:16:19 +0000 (00:16 -0400)
committerYanhua Sun <sun51@illinois.edu>
Fri, 29 Jul 2011 04:16:19 +0000 (00:16 -0400)
1  2 
src/arch/gemini_gni/machine.c

Simple merge