tree fc2efb59d627135ea2199a8a68415b162646b121
parent 5a611268b69f05262936dd177205acbce4471358
parent 5ee810072175042775e39bdd3eaaa68884c27805
author Ingo Molnar <mingo@elte.hu> 1233054111 +0100
committer Ingo Molnar <mingo@elte.hu> 1233054111 +0100

Merge branch 'linus' into core/percpu

Conflicts:
	arch/x86/kernel/setup_percpu.c