git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3f705df
f22e6e8
)
Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts
author
Ingo Molnar
<mingo@kernel.org>
Wed, 8 Apr 2015 07:01:54 +0000
(09:01 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 8 Apr 2015 07:01:54 +0000
(09:01 +0200)
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff