| commit | 38452af2424dc99854c78523d74b260fa8a984f0 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Jul 15 10:26:04 2016 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Jul 15 10:26:04 2016 +0200 |
| tree | 0dc49c27e1a58a0b35c23db05d85d2e8571ea471 | |
| parent | dcb32d9913b7ed527b135a7e221f8d14b67bb952 [diff] | |
| parent | be8a18e2e98e04a5def5887d913b267865562448 [diff] |
Merge branch 'x86/asm' into x86/mm, to resolve conflicts Conflicts: tools/testing/selftests/x86/Makefile Signed-off-by: Ingo Molnar <mingo@kernel.org>