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
..
configs	m68knommu: update the default config for the ColdFire 5407C3 board	2009-04-23 09:23:32 +10:00
kernel	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
lib	Generic semaphore implementation	2008-04-17 10:42:34 -04:00
mm	arch/m68knommu: Convert #ifdef DEBUG printk(KERN_DEBUG to pr_debug(	2009-06-11 13:09:11 +10:00
platform	m68knommu: remove obsolete reset code	2009-06-11 13:09:11 +10:00
defconfig	m68knommu: update defconfig	2008-03-04 08:04:11 -08:00
Kconfig	m68knommu: fix DMA support for ColdFire	2009-04-22 14:45:08 +10:00
Kconfig.debug	m68knommu: removing config variable DUMPTOFLASH	2008-02-05 09:44:21 -08:00
Makefile	m68knommu: improve compile arch switch settings	2009-03-30 10:29:45 +10:00