tree a5525d63fe682e6744c109fb72f7e1b33855cb00
parent 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918
parent cf3997f507624757f149fcc42b76fb03c151fb65
author Ingo Molnar <mingo@elte.hu> 1233054204 +0100
committer Ingo Molnar <mingo@elte.hu> 1233054204 +0100

Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu

Conflicts:
	arch/x86/kernel/setup_percpu.c

Semantic conflict:

	arch/x86/kernel/cpu/common.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>