Merge branch 'x86/asm' into x86/urgent
commitab1eebe77dd08b26585860d534e07810d1cd274d
authorIngo Molnar <mingo@elte.hu>
Tue, 15 Dec 2009 19:33:22 +0000 (15 20:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 15 Dec 2009 19:33:28 +0000 (15 20:33 +0100)
tree92b1ff0952cbdeef34922c43ff7eaac2162e77c4
parent186a25026c44d1bfa97671110ff14dcd0c99678e
parentdf59e7bf439918f523ac29e996ec1eebbed60440
Merge branch 'x86/asm' into x86/urgent

Merge reason: it's stable so lets push it upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/process.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c