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)
commit9b4bd5186333f77450f9e53d29d9fdf8a5ba1fff
tree9a8daa40165999a350ba5633d112a158fc4fc28e
parentbf8c6c251851f001e288e932f51c4aff1bfbb6b0
parente51d1d7ac6a81ca30f98021cde6a5a7a09c6bedf
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c