git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
72d64cc
b3494a4
)
Merge branch 'x86/urgent' into x86/asm, to resolve conflict
author
Ingo Molnar
<mingo@kernel.org>
Tue, 24 Mar 2015 20:14:07 +0000
(21:14 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 25 Mar 2015 12:19:43 +0000
(13:19 +0100)
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff