Commit f53f292e authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge remote-tracking branch 'efi/chainsaw' into x86/efi



Resolved Conflicts:
	drivers/firmware/efivars.c
	fs/efivarsfs/file.c

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents 15b9c359 a9499fa7
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment