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
..
acpi	Revert "ACPICA: Remove obsolete acpi_os_validate_address interface"	2009-07-27 18:42:38 -04:00
asm-generic	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
crypto
drm	drm/radeon: Add support for RS880 chips	2009-08-05 12:07:09 +10:00
keys
linux	Merge branch 'percpu-for-linus' into percpu-for-next	2009-08-14 14:45:31 +09:00
math-emu
media	V4L/DVB (12283): gspca - sn9c20x: New subdriver for sn9c201 and sn9c202 bridges.	2009-07-24 14:03:30 -03:00
mtd
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2009-08-03 19:05:50 -07:00
pcmcia
rdma
rxrpc
scsi
sound
trace	perf_counter: Zero dead bytes from ftrace raw samples size alignment	2009-08-10 16:51:19 +02:00
video
xen
Kbuild