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)
commitfaddd70cfda6a0664ce7ff277f4dc9c0f757b408
tree5045c3e466664b6e33a4539120bf423c4d857f52
parentd27fb2844538e6cd78f46dd84ad24e5686084a84
parent66175be3b92b28d8fec0aa9e2f67b5571fad35bd
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c