]> 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)
commit75320c5b2be460e65e7b1238ac63ac58dcb16fbf
tree0cb15781539a68f27b4ea6c89f827282630cbce6
parente8ca328c4bdceea50be178d2f077863d3e1f26d5
parent39835e378f4b066927659ad06e5ea54f6415cb33
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