diff options
| author |   Matt Fleming <matt.fleming@intel.com> | 2014-03-05 17:22:57 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 17:31:41 +0000 |
| commit | 4fd69331ad227a4d8de26592d017b73e00caca9f (patch) | |
| tree | bfd95ed518ff0cb44318715432d321a92a7b9a0c /include/linux/timerqueue.h | |
| parent | efi: Use NULL instead of 0 for pointer (diff) | |
| parent | x86, trace: Fix CR2 corruption when tracing page faults (diff) | |
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
Conflicts:
arch/x86/include/asm/efi.h
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions