| commit | 78726ee5ff3fc76697c8754e0f546915bd61e7c6 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sat Jan 30 11:21:40 2016 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Sat Jan 30 11:21:40 2016 +0100 |
| tree | 3205c3066b632aade9bad9e1951586b065ac2192 | |
| parent | 1e423bff959e48166f5b7efca01fdb0dbdf05846 [diff] | |
| parent | a1ff5726081858a9ad98934eff7af6616c576875 [diff] |
Merge branch 'x86/cpu' into x86/asm, to avoid conflict Signed-off-by: Ingo Molnar <mingo@kernel.org>