Merge branch 'x86/ras' into ras/core, to pick up changes
authorIngo Molnar <mingo@kernel.org>
Mon, 12 Oct 2015 12:52:34 +0000 (14:52 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 12 Oct 2015 12:52:34 +0000 (14:52 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge