linux/arch/m32r
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 m32r: build fix for __stringify macro 2009-05-02 21:43:26 +09:00
configs eeprom: More consistent symbol names 2009-01-26 21:19:57 +01:00
include/asm mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
kernel Merge branch 'percpu-for-linus' into percpu-for-next 2009-08-14 14:45:31 +09:00
lib m32r: export __ndelay 2008-09-27 18:27:21 +09:00
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
platforms m32r: remove obsolete hw_interrupt_type 2009-06-16 19:47:46 -07:00
Kconfig Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-12-30 08:02:35 +10:30
Kconfig.debug [PATCH] kconfig: clarify memory debug options 2006-03-25 08:22:54 -08:00
Makefile m32r: use KBUILD_DEFCONFIG 2008-04-29 14:46:00 +09:00