| commit | d8d1c35139481ee8e292d91cd3fd35a6b3a316eb | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Apr 13 11:36:19 2016 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Apr 13 11:36:19 2016 +0200 |
| tree | 0a06b6c185e91bf14b22e7f526755e2ca80209bf | |
| parent | cb44d0cfc2969999a4d9e20e4fd8749fec6c5498 [diff] | |
| parent | 1886297ce0c8d563a08c8a8c4c0b97743e06cd37 [diff] |
Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base Conflicts: arch/x86/include/asm/cpufeature.h Signed-off-by: Ingo Molnar <mingo@kernel.org>