Merge branch 'linus' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Tue, 27 Jan 2009 11:01:51 +0000 (12:01 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 27 Jan 2009 11:01:51 +0000 (12:01 +0100)
commit3ddeb51d9c83931c1ca6abf76a38934c5a1ed918
treefc2efb59d627135ea2199a8a68415b162646b121
parent5a611268b69f05262936dd177205acbce4471358
parent5ee810072175042775e39bdd3eaaa68884c27805
Merge branch 'linus' into core/percpu

Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/kernel/setup_percpu.c
arch/x86/kernel/tlb_uv.c
arch/x86/mm/init_32.c
drivers/misc/Kconfig
include/linux/sched.h
kernel/fork.c