Merge remote-tracking branch 'efi/chainsaw' into x86/efi
authorH. Peter Anvin <hpa@linux.intel.com>
Sat, 20 Apr 2013 16:16:44 +0000 (09:16 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Sat, 20 Apr 2013 16:16:44 +0000 (09:16 -0700)
commitf53f292eeaa234615c31a1306babe703fc4263f2
tree707b0933a20f7dc05495e974243a23b5c9f8c918
parent15b9c359f288b09003cb70f7ed204affc0c6614d
parenta9499fa7cd3fd4824a7202d00c766b269fa3bda6
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>
arch/x86/platform/efi/efi.c
fs/efivarfs/file.c