| commit | 75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sun May 17 07:57:31 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Sun May 17 07:57:31 2015 +0200 |
| tree | 7167fa30a5c46766c10c4b9a37d7bf9373c26c6d | |
| parent | 52648e83c9a6b9f7fc3dd272d4d10175e93aa62a [diff] | |
| parent | c0655fe9b0901a968800f56687be3c62b4cce5d2 [diff] |
Merge branch 'linus' into x86/asm, to resolve conflicts Conflicts: tools/testing/selftests/x86/Makefile tools/testing/selftests/x86/run_x86_tests.sh