git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5c12af0
d6e0a2d
)
Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts
author
Ingo Molnar
<mingo@kernel.org>
Sun, 5 Jan 2014 11:34:29 +0000
(12:34 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Sun, 5 Jan 2014 11:34:29 +0000
(12:34 +0100)
Conflicts:
arch/x86/platform/efi/efi.c
drivers/firmware/efi/Kconfig
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff