Merge branch 'develop' into sandybridge
authorXianyi Zhang <traits.zhang@gmail.com>
Fri, 25 May 2012 15:16:44 +0000 (23:16 +0800)
committerXianyi Zhang <traits.zhang@gmail.com>
Fri, 25 May 2012 15:16:44 +0000 (23:16 +0800)
1  2 
Makefile.system
cpuid_x86.c

diff --cc Makefile.system
Simple merge
diff --cc cpuid_x86.c
Simple merge