projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52648e8 c0655fe)
Merge branch 'linus' into x86/asm, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Sun, 17 May 2015 05:57:31 +0000 (07:57 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 17 May 2015 05:57:31 +0000 (07:57 +0200)
commit75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd
tree7167fa30a5c46766c10c4b9a37d7bf9373c26c6dtree | snapshot (tar.gz zip)
parent52648e83c9a6b9f7fc3dd272d4d10175e93aa62acommit | diff
parentc0655fe9b0901a968800f56687be3c62b4cce5d2commit | diff
Merge branch 'linus' into x86/asm, to resolve conflicts

Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
tools/testing/selftests/x86/Makefile diff1 | diff2 | blob | history