Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Sun, 1 Apr 2012 07:23:26 +0000 (02:23 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sun, 1 Apr 2012 07:23:26 +0000 (02:23 -0500)
commit7407955c5f0d3c698b513f966dc849d275b09976
tree37f1529f9d947c24517f1a940c2a2112a1842cf8
parent5974160047dd61daf907f0a1811890728f8c13a3
parentb1ab70dba796eaa908652a22e2203ad81785a515
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c