]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf6ae3eb1467d40b806e4905244312a4be0f39a32
tree0cb15781539a68f27b4ea6c89f827282630cbce6
parent6b58b44f70c39a3899148554aa936610f05d09a7
parent049cd643bda88ffaa8b03a6a90f0a644616b996d
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