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	sh: fix i2c init order on ap325rxa V2	2009-08-13 11:43:43 +09:00
boot
cchips
configs	sh: re-add LCDC fbdev support to the Migo-R defconfig	2009-07-01 15:31:33 +09:00
drivers	sh: pci: Initial PCI-Express support for SH7786 Urquell board.	2009-06-17 18:20:48 +09:00
include	mm: Remove duplicate definitions in MIPS and SH	2009-07-27 17:26:44 -07:00
kernel	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
lib
lib64	sh: Convert sh64 to use the generic checksum code.	2009-06-15 00:00:42 +09:00
math-emu
mm	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
oprofile
tools
Kconfig	sh: Fix up HAVE_PERF_COUNTERS typo.	2009-06-24 01:41:05 +09:00
Kconfig.cpu
Kconfig.debug	sh: Kill off unused DEBUG_BOOTMEM symbol.	2009-06-25 21:17:19 +09:00
Makefile