diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:39:44 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 16:39:53 +0200 |
| commit | 8ffcfa4e2d96342180e02dfe1230b97778c52d72 (patch) | |
| tree | 77255a0235022444fe958ab1092fb352e6222b72 /arch/x86/include/asm/srat.h | |
| parent | b683de2b3cb17bb10fa6fd4af614dc75b5749fe0 (diff) | |
| parent | fa47f7e52874683a9659df2f1f143105f676dc0f (diff) | |
Merge branch 'x86/x2apic' into irq/sparseirq
Reason: Avoid conflicts with the x2apic modifications
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/srat.h')
0 files changed, 0 insertions, 0 deletions