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
..
boards	Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2009-06-13 15:34:22 +02:00
boot	avr32: remove .note.gnu.build-id section when making vmlinux.bin	2008-12-17 11:44:10 +01:00
configs	avr32: Add support for Mediama RMTx add-on board for ATNGW100	2009-06-08 12:55:35 +02: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	avr32: Fix out-of-range rcalls in large kernels	2009-01-16 09:31:57 +01:00
mach-at32ap	avr32: Fix clash in ATMEL_USART_ flags	2009-06-03 11:38:20 +02:00
mm	Move FAULT_FLAG_xyz into handle_mm_fault() callers	2009-06-21 13:08:22 -07:00
oprofile	Add kernel support for oprofile callgraphs on AVR32	2008-09-22 09:51:01 +02:00
Kconfig	Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2009-04-05 11:15:28 -07:00
Kconfig.debug	[AVR32] Include instrumentation menu	2008-01-25 08:31:40 +01:00
Makefile	avr32: drop unused CLEAN_FILES	2009-05-01 10:54:00 +02:00