git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts
[pandora-kernel.git]
/
drivers
/
firmware
/
efi
/
Kconfig
diff --cc
drivers/firmware/efi/Kconfig
Simple merge
git.openpandora.org / pandora-kernel.git / blobdiff