git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
15b9c35
a9499fa
)
Merge remote-tracking branch 'efi/chainsaw' into x86/efi
author
H. Peter Anvin
<hpa@linux.intel.com>
Sat, 20 Apr 2013 16:16:44 +0000
(09:16 -0700)
committer
H. Peter Anvin
<hpa@linux.intel.com>
Sat, 20 Apr 2013 16:16:44 +0000
(09:16 -0700)
Resolved Conflicts:
drivers/firmware/efivars.c
fs/efivarsfs/file.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff