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
..
boot	inflate: refactor inflate malloc code	2008-07-25 10:53:28 -07:00
include/asm	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
kernel	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
lib
math-emu
mm	Move FAULT_FLAG_xyz into handle_mm_fault() callers	2009-06-21 13:08:22 -07:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
defconfig
Kconfig	alpha: switch to dynamic percpu allocator	2009-06-24 15:13:52 +09:00
Kconfig.debug
Makefile	alpha: link failure fix	2008-06-20 16:46:10 -07:00