Merge remote-tracking branch 'efi/chainsaw' into x86/efi
Resolved Conflicts:
drivers/firmware/efivars.c
fs/efivarsfs/file.c
Signed-off-by:
H. Peter Anvin <hpa@linux.intel.com>
Loading
Please register or sign in to comment
Resolved Conflicts:
drivers/firmware/efivars.c
fs/efivarsfs/file.c
Signed-off-by:
H. Peter Anvin <hpa@linux.intel.com>