commit | 4fd69331ad227a4d8de26592d017b73e00caca9f | [log] [tgz] |
---|---|---|
author | Matt Fleming <matt.fleming@intel.com> | Wed Mar 05 17:22:57 2014 +0000 |
committer | Matt Fleming <matt.fleming@intel.com> | Wed Mar 05 17:31:41 2014 +0000 |
tree | bfd95ed518ff0cb44318715432d321a92a7b9a0c | |
parent | 69e608411473ac56358ef35277563982d0565381 [diff] | |
parent | 0ac09f9f8cd1fb028a48330edba6023d347d3cea [diff] |
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo Conflicts: arch/x86/include/asm/efi.h