Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Fri, 17 Feb 2012 06:19:36 +0000 (00:19 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Fri, 17 Feb 2012 06:19:36 +0000 (00:19 -0600)
commit9a64f9b306f0d8967feaafec9cc3b4cf55c26c45
treeb2b758bc70ca846c6e1be51eadedeeac53e5bba2
parent6000c43bda5709b1fefcd59231b87100f89ac611
parent95643a16d636a131377348897e28c9758d0d3747
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c