Resolved Conflicts:
	drivers/firmware/efivars.c
	fs/efivarsfs/file.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>