Merge branch 'develop' into cmake
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 12 Oct 2015 20:46:08 +0000 (04:46 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 12 Oct 2015 20:46:08 +0000 (04:46 +0800)
commit94b125255f35615a6ec2431651690ef1e5b174ac
tree0dcd732c6d2c50c61208a2cd62e5cf52b2cfe9e3
parent17ee2237c382e8ea3f9d3a8aa74aef4a1d12ff17
parent3684706a121f9d9e1ccfc4a2bbb98f698eb04514
Merge branch 'develop' into cmake

Conflicts:
driver/others/memory.c
.gitignore
common.h
common_x86.h
common_x86_64.h
cpuid_x86.c
driver/others/memory.c
getarch.c
kernel/Makefile.L3