| commit | d834a9dcecae834cd6b2bc5e50e1907738d9cf6a | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Thu Dec 09 18:17:25 2010 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Thu Dec 09 18:17:25 2010 +0100 |
| tree | 0589d753465d3fe359ba451ba6cb7798df03aaa2 | |
| parent | a38c5380ef9f088be9f49b6e4c5d80af8b1b5cd4 [diff] | |
| parent | f658bcfb2607bf0808966a69cf74135ce98e5c2d [diff] |
Merge branch 'x86/amd-nb' into x86/apic-cleanups Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform Conflicts: arch/x86/include/asm/io_apic.h Signed-off-by: Thomas Gleixner <tglx@linutronix.de>