diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-18 09:39:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-18 09:39:47 +0200 |
| commit | a5dd19249607474ed680f16b4f5e8477d2b68689 (patch) | |
| tree | 1aeeef053773c07bc02f3aa637febc80ceb96732 /arch/x86/kernel/crash_dump_64.c | |
| parent | 6b7e26547fad7ace3dcb27a5babd2317fb9d1e12 (diff) | |
| parent | 512255a2ad2c832ca7d4de9f31245f73781922d0 (diff) | |
| download | linux-a5dd19249607474ed680f16b4f5e8477d2b68689.tar.bz2 | |
Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
Conflicts:
arch/x86/entry/entry_64_compat.S
arch/x86/math-emu/get_address.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/crash_dump_64.c')
0 files changed, 0 insertions, 0 deletions