Merge branch 'x86/trampoline' into x86/urgent
authorH. Peter Anvin <hpa@zytor.com>
Wed, 30 May 2012 19:11:26 +0000 (12:11 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 30 May 2012 19:11:32 +0000 (12:11 -0700)
commitbbd771474ec44b516107685d77e1c80bbe09f141
tree0cb15781539a68f27b4ea6c89f827282630cbce6
parent403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307
parent319b6ffc6df892e4ccffff823cc5521a4a5d2dca
Merge branch 'x86/trampoline' into x86/urgent

x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/mm/pat.c