Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper05.(none)>
Tue, 7 Feb 2012 21:20:39 +0000 (13:20 -0800)
committerYanhua Sun <sun51@hopper05.(none)>
Tue, 7 Feb 2012 21:20:39 +0000 (13:20 -0800)
commitdfc11dae7f6a0efdff0a6382d4013d82f3dbc33b
treea2b359f1eb46b379c246f956af20acd703f18836
parentcd55303c8858763f1e0d5c8260b7e33f42fc8fbd
parent55c3d0fc49cbb54c64bb42c620cf23b7e6cfec2b
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c