merge first
authorYanhua Sun <yanhuas@jyc1.(none)>
Sat, 18 Feb 2012 00:10:01 +0000 (18:10 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Sat, 18 Feb 2012 00:10:01 +0000 (18:10 -0600)
commit84c9fa71443f53be50601df1ccd0ad0079388744
tree7c898e4aebcd867b1986ad68c8818467806ce81f
parent6938613de07fbed889f9aa293fdcdf67f7591208
merge first
src/arch/gemini_gni/machine.c
src/arch/util/machine.h