Merge branch 'bulldozer' into develop

author Zhang Xianyi <traits.zhang@gmail.com>

Sat, 9 Feb 2013 17:19:42 +0000 (01:19 +0800)

committer Zhang Xianyi <traits.zhang@gmail.com>

Sat, 9 Feb 2013 17:19:42 +0000 (01:19 +0800)
author Zhang Xianyi <traits.zhang@gmail.com>
Sat, 9 Feb 2013 17:19:42 +0000 (01:19 +0800)
committer Zhang Xianyi <traits.zhang@gmail.com>
Sat, 9 Feb 2013 17:19:42 +0000 (01:19 +0800)
diff --cc Makefile.system
Simple merge
diff --cc cpuid_x86.c
Simple merge
diff --cc driver/others/dynamic.c
Simple merge
diff --cc kernel/setparam-ref.c
Simple merge
author	Zhang Xianyi <traits.zhang@gmail.com>
	Sat, 9 Feb 2013 17:19:42 +0000 (01:19 +0800)
committer	Zhang Xianyi <traits.zhang@gmail.com>
	Sat, 9 Feb 2013 17:19:42 +0000 (01:19 +0800)
		1	2
Makefile.system	patch \|	diff1 \|	diff2 \|	blob \| history
cpuid_x86.c	patch \|	diff1 \|	diff2 \|	blob \| history
driver/others/dynamic.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/setparam-ref.c	patch \|	diff1 \|	diff2 \|	blob \| history