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	powerpc/83xx: Fix PCI IO base address on MPC837xE-RDB boards	2009-07-29 23:18:41 -05:00
configs	powerpc: Update defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx	2009-07-29 23:34:01 -05:00
include/asm	KVM: Make KVM_HPAGES_PER_HPAGE unsigned long to avoid build error on powerpc	2009-08-05 14:51:33 +03:00
kernel	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
kvm	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
lib	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
math-emu	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00
mm	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
oprofile	powerpc: Remove unnecessary semicolons	2009-07-08 13:50:21 +10:00
platforms	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
sysdev	powerpc: Don't use alloc_bootmem() in init_IRQ() path	2009-07-08 13:50:25 +10:00
xmon	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
Kconfig	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
Kconfig.debug	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
Makefile	powerpc: Move VMX and VSX asm code to vector.S	2009-06-09 16:46:25 +10:00