Merge branch 'ras/core' into core/objtool, to pick up the new exception table format
authorIngo Molnar <mingo@kernel.org>
Thu, 25 Feb 2016 08:01:09 +0000 (09:01 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 25 Feb 2016 08:01:09 +0000 (09:01 +0100)
commit319e305ca469d9484678d2916590005b08cc3b4b
treeffee522a28589e4ba78b616bcde76dac4cc3c667
parentc0853867a10f9215132dccdb84c720a5f856f4d2
parentb2f9d678e28ca71ce650eac82f26dd287b47e89a
Merge branch 'ras/core' into core/objtool, to pick up the new exception table format

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/msr-index.h
arch/x86/include/asm/uaccess.h
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/kprobes/core.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c