diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
| commit | 75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd (patch) | |
| tree | 7167fa30a5c46766c10c4b9a37d7bf9373c26c6d /scripts/Makefile | |
| parent | x86: Pack loops tightly as well (diff) | |
| parent | Merge tag 'usb-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| download | linux-75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd.tar.xz linux-75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd.zip | |
Merge branch 'linus' into x86/asm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
Diffstat (limited to 'scripts/Makefile')
0 files changed, 0 insertions, 0 deletions