diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:58:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:58:08 +0200 |
| commit | cffc32975da7df2ef909299c47ff644e1357e0ac (patch) | |
| tree | 04cfa6276b890f49f686d65be7397c4232ac44af /include/linux/timerqueue.h | |
| parent | x86: Consolidate irq entering inlines (diff) | |
| parent | x86/asm/entry/64: Use shorter MOVs from segment registers (diff) | |
Merge branch 'x86/asm' into x86/apic, to resolve conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions