-
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip由 Rusty Russell 提交于
Conflicts: arch/x86/include/asm/topology.h drivers/oprofile/buffer_sync.c (Both cases: changed in Linus' tree, removed in Ingo's).
558f6ab9
Conflicts: arch/x86/include/asm/topology.h drivers/oprofile/buffer_sync.c (Both cases: changed in Linus' tree, removed in Ingo's).