]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
Merge branch 'master' into percpu
authorTejun Heo <tj@kernel.org>
Tue, 5 Jan 2010 00:17:33 +0000 (09:17 +0900)
committerTejun Heo <tj@kernel.org>
Tue, 5 Jan 2010 00:17:33 +0000 (09:17 +0900)
commit32032df6c2f6c9c6b2ada2ce42322231824f70c2
treeb1ce838a37044bb38dfc128e2116ca35630e629a
parent22b737f4c75197372d64afc6ed1bccd58c00e549
parentc5974b835a909ff15c3b7e6cf6789b5eb919f419
Merge branch 'master' into percpu

Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
12 files changed:
arch/blackfin/mach-common/entry.S
arch/x86/include/asm/system.h
arch/x86/kernel/apic/nmi.c
arch/x86/kernel/head_32.S
arch/x86/kernel/vmlinux.lds.S
include/linux/compiler.h
include/linux/percpu.h
include/linux/vmstat.h
kernel/rcutorture.c
kernel/trace/trace.c
kernel/trace/trace_functions_graph.c
mm/percpu.c