| commit | c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sun Jun 07 15:35:27 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Sun Jun 07 15:35:27 2015 +0200 |
| tree | 142041dd61132d487c2afddc8db32b350ee181ee | |
| parent | c8e56d20f2d190d54c0615775dcb6a23c1091681 [diff] | |
| parent | 243d657eaf540db882f73497060da5a4f7d86a90 [diff] |
Merge branch 'x86/ras' into x86/core, to fix conflicts Conflicts: arch/x86/include/asm/irq_vectors.h Signed-off-by: Ingo Molnar <mingo@kernel.org>