diff options
| author |   Matt Fleming <matt.fleming@intel.com> | 2014-03-05 18:15:37 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 18:15:37 +0000 |
| commit | 994448f1afa6689bafbebaf7412b23b541b41ef5 (patch) | |
| tree | b7460c6a9bdadc6554ad7f0da52b5c60403164c1 /include/linux/timerqueue.h | |
| parent | Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo (diff) | |
| parent | x86/efi: Re-disable interrupts after calling firmware services (diff) | |
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 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions