Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Wed, 22 Feb 2012 23:24:31 +0000 (17:24 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Wed, 22 Feb 2012 23:24:31 +0000 (17:24 -0600)
commit7a646ffdd90f59cdbf271fe98da6c834c8455dbb
tree26d8d35d375ca2b399ed5a48632c98edd330ea1c
parent0148bf4dca4b3495936e5d381342179440804d28
parent8a763f0f19e8e6a1ec49d8bc815b4e695dfb2812
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c