linux/arch/parisc
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 parisc: update defconfigs 2009-03-13 01:33:34 -04:00
hpux ptrace: remove PT_DTRACE from avr32, mn10300, parisc, s390, sh, xtensa 2009-06-18 13:03:48 -07: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 parisc: fix mismatched parenthesis in memcpy.c 2009-07-03 03:34:09 +00:00
math-emu parisc: decode_exc.c should include kernel.h 2009-07-03 03:34:08 +00:00
mm parisc: fix compile warning in mm/init.c 2009-07-03 03:34:10 +00:00
oprofile oprofile: more whitespace fixes 2008-10-15 20:55:51 +02:00
defpalo.conf Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
install.sh Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig parisc: use generic atomic64 on 32-bit 2009-07-03 03:34:13 +00:00
Kconfig.debug alpha/parisc: remove config variable DEBUG_RWLOCK 2008-02-06 10:41:03 -08:00
Makefile parisc: add ftrace (function and graph tracer) functionality 2009-03-31 02:51:34 +00:00
nm Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00