git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
69e6084
0ac09f9
)
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
author
Matt Fleming
<matt.fleming@intel.com>
Wed, 5 Mar 2014 17:22:57 +0000
(17:22 +0000)
committer
Matt Fleming
<matt.fleming@intel.com>
Wed, 5 Mar 2014 17:31:41 +0000
(17:31 +0000)
Conflicts:
arch/x86/include/asm/efi.h
Trivial merge