Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper08.(none)>
Mon, 15 Aug 2011 01:01:02 +0000 (18:01 -0700)
committerYanhua Sun <sun51@hopper08.(none)>
Mon, 15 Aug 2011 01:01:02 +0000 (18:01 -0700)
commitc9323f3b73cb4a28a31f3bc86e5c327f0ee356b3
tree0dc7ce427cd107ff3dc59487015a9705b04945a5
parentf412ff4569f10b6cf110accaea4219423a48155b
parentb1d240561cd75b8d658b5543787afdbfa8bbfd8b
Merge branch 'charm' of charmgit:charm into charm
src/arch/gemini_gni/machine.c