tree 707b0933a20f7dc05495e974243a23b5c9f8c918
parent 15b9c359f288b09003cb70f7ed204affc0c6614d
parent a9499fa7cd3fd4824a7202d00c766b269fa3bda6
author H. Peter Anvin <hpa@linux.intel.com> 1366474604 -0700
committer H. Peter Anvin <hpa@linux.intel.com> 1366474604 -0700

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>