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)
commit6ff81381f080175a4c63bba1ac289945dec4204b
treefc030a9d9f04b7c1c5629a4543d46801a19e44dd
parenta70e60a2414c1b4cdf98d5280d9aaf50da1e3ff9
parentc1fa9b43b7fa8ba2c9c7faed50220f5f9ab55136
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c