tree 04c93f391a1b65c8bf8d7ba8643c07d26c26590a
parent a76761b621bcd8336065c4fe3a74f046858bc34c
parent 142d44b0dd6741a64a7bdbe029110e7c1dcf1d23
author Tejun Heo <tj@kernel.org> 1250228462 +0900
committer Tejun Heo <tj@kernel.org> 1250228731 +0900

Merge branch 'percpu-for-linus' into percpu-for-next

Conflicts:
	arch/sparc/kernel/smp_64.c
	arch/x86/kernel/cpu/perf_counter.c
	arch/x86/kernel/setup_percpu.c
	drivers/cpufreq/cpufreq_ondemand.c
	mm/percpu.c

Conflicts in core and arch percpu codes are mostly from commit
ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many
num_possible_cpus() with nr_cpu_ids.  As for-next branch has moved all
the first chunk allocators into mm/percpu.c, the changes are moved
from arch code to mm/percpu.c.

Signed-off-by: Tejun Heo <tj@kernel.org>