kernel-ark/init
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
..
calibrate.c
do_mounts_initrd.c
do_mounts_md.c
do_mounts_rd.c
do_mounts.c fs: fix do_mount_root() false positive kmemcheck warning 2009-06-15 15:49:42 +02:00
do_mounts.h
initramfs.c initramfs: clean up messages related to initramfs unpacking 2009-05-06 16:36:10 -07:00
Kconfig perf_counter: Set the CONFIG_PERF_COUNTERS default to y if CONFIG_PROFILING=y 2009-08-04 18:19:30 +02:00
main.c Merge branch 'percpu-for-linus' into percpu-for-next 2009-08-14 14:45:31 +09:00
Makefile
noinitramfs.c
version.c