| commit | a5dd19249607474ed680f16b4f5e8477d2b68689 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Aug 18 09:39:47 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Aug 18 09:39:47 2015 +0200 |
| tree | 1aeeef053773c07bc02f3aa637febc80ceb96732 | |
| parent | 6b7e26547fad7ace3dcb27a5babd2317fb9d1e12 [diff] | |
| parent | 512255a2ad2c832ca7d4de9f31245f73781922d0 [diff] |
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>