From: Tejun Heo <tj@kernel.org>
Date: Fri, 14 Aug 2009 05:41:02 +0000 (+0900)
Subject: Merge branch 'percpu-for-linus' into percpu-for-next
X-Git-Tag: v2.6.32-rc1~676^2^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=384be2b18a5f9475eab9ca2bdfa95cc1a04ef59c;p=pandora-kernel.git

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>
---

384be2b18a5f9475eab9ca2bdfa95cc1a04ef59c
Reading git-diff-tree failed