| commit | cffc32975da7df2ef909299c47ff644e1357e0ac | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sun May 17 07:58:08 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Sun May 17 07:58:08 2015 +0200 |
| tree | 04cfa6276b890f49f686d65be7397c4232ac44af | |
| parent | 6dc178760553605c58d78bd403dfcb4e042c5b72 [diff] | |
| parent | adeb5537849d9db428fe0ddc3562e5a765a347e2 [diff] |
Merge branch 'x86/asm' into x86/apic, to resolve conflicts Signed-off-by: Ingo Molnar <mingo@kernel.org>