Merge branch 'develop' into bulldozer
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 28 Jul 2013 04:38:25 +0000 (06:38 +0200)
committerZhang Xianyi <traits.zhang@gmail.com>
Sun, 28 Jul 2013 04:38:25 +0000 (06:38 +0200)
commit72b1edaf1bbb0c004eb5a4d4546eaea445158e05
treebd34aa20a6197518fd1d9fa86b47772a9afcf7e2
parent6ae2f868fdad1c7077034e6557f1353773ed1ab3
parenta2930664f42d5c7635bb83b3c7f3c988c5849c78
Merge branch 'develop' into bulldozer

Conflicts:
kernel/x86_64/KERNEL.BULLDOZER
driver/others/init.c
kernel/x86_64/KERNEL.BULLDOZER