diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-09-01 12:13:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-01 12:13:30 +0200 |
| commit | c931aaf0e1b11862077f6884b2cec22833080e23 (patch) | |
| tree | a54b0ff24dd4b09fe8b3bff62b7c5ce82e197387 /include/linux/timerqueue.h | |
| parent | x86, msr: Export the register-setting MSR functions via /dev/*/msr (diff) | |
| parent | x86/paravirt: split paravirt definitions into paravirt_types.h (diff) | |
Merge branch 'x86/paravirt' into x86/cpu
Conflicts:
arch/x86/include/asm/paravirt.h
Manual merge:
arch/x86/include/asm/paravirt_types.h
Merge reason: x86/paravirt conflicts non-trivially with x86/cpu,
resolve it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions