Tejun Heo 384be2b18a 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>		2009-08-14 14:45:31 +09:00
..
alpha	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
arm	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
avr32	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
blackfin	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
cris	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
frv	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
h8300	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
ia64	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
m32r	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
m68k	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
m68knommu	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
microblaze	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
mips	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
mn10300	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
parisc	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
powerpc	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
s390	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
sh	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
sparc	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
um	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
x86	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
xtensa	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
.gitignore
Kconfig	gcov: add gcov profiling infrastructure	2009-06-18 13:03:57 -07:00