Merge branch 'develop' into cmake
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 4 Aug 2015 04:59:01 +0000 (23:59 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 4 Aug 2015 04:59:01 +0000 (23:59 -0500)
commitab0a0a75fc7758a0c18d9a16108ff971b3a255f4
tree2e841765685bcb1f8ed1e87b9144da7484862f23
parent7ac7e147d4d9961d9082338efe7d6c6e6aea9a29
parent1cf2b10224d4bd5ea9b4e1fc0654d9734fbcc777
Merge branch 'develop' into cmake
kernel/x86_64/KERNEL