Merge branch 'x86/amd-nb' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Mar 2011 15:33:56 +0000 (16:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Mar 2011 15:34:01 +0000 (16:34 +0100)
commit344c21c32287755b5cda0eeb84adb4546a57c1db
treec1a7e2332e4650b62c451279d84e0ed0890995fa
parentb87cf80af3ba4b4c008b4face3c68d604e1715c6
parent84fd1d35cc868a4f7590b6dbdae2d7761287b97a
Merge branch 'x86/amd-nb' into x86/urgent

Merge reason: This is one followup commit that was not in x86/mm - merge it via the urgent path

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/smpboot.c