git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
52648e8
c0655fe
)
Merge branch 'linus' into x86/asm, to resolve conflicts
author
Ingo Molnar
<mingo@kernel.org>
Sun, 17 May 2015 05:57:31 +0000
(07:57 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Sun, 17 May 2015 05:57:31 +0000
(07:57 +0200)
Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff