diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 22:15:37 +0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 22:15:37 +0400 |
| commit | 994448f1afa6689bafbebaf7412b23b541b41ef5 (patch) | |
| tree | b7460c6a9bdadc6554ad7f0da52b5c60403164c1 /drivers/macintosh/via-cuda.c | |
| parent | 4fd69331ad227a4d8de26592d017b73e00caca9f (diff) | |
| parent | 18c46461d9e42d398536055f31f58cdcd2c6347e (diff) | |
| download | linux-994448f1afa6689bafbebaf7412b23b541b41ef5.tar.xz | |
Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo
Conflicts:
arch/x86/kernel/setup.c
arch/x86/platform/efi/efi.c
arch/x86/platform/efi/efi_64.c
Diffstat (limited to 'drivers/macintosh/via-cuda.c')
0 files changed, 0 insertions, 0 deletions