| commit | f53f292eeaa234615c31a1306babe703fc4263f2 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Sat Apr 20 09:16:44 2013 -0700 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Sat Apr 20 09:16:44 2013 -0700 |
| tree | 707b0933a20f7dc05495e974243a23b5c9f8c918 | |
| parent | 15b9c359f288b09003cb70f7ed204affc0c6614d [diff] | |
| parent | a9499fa7cd3fd4824a7202d00c766b269fa3bda6 [diff] |
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>