diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 17:22:57 (GMT) |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 17:31:41 (GMT) |
| commit | 4fd69331ad227a4d8de26592d017b73e00caca9f (patch) | |
| tree | bfd95ed518ff0cb44318715432d321a92a7b9a0c /block | |
| parent | 69e608411473ac56358ef35277563982d0565381 (diff) | |
| parent | 0ac09f9f8cd1fb028a48330edba6023d347d3cea (diff) | |
| download | linux-4fd69331ad227a4d8de26592d017b73e00caca9f.tar.xz | |
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts:
arch/x86/include/asm/efi.h
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions