| commit | cb4cfd568c1181501419b89d916e8523107c0106 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Wed Feb 23 20:00:55 2011 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Wed Feb 23 20:01:01 2011 +0100 |
| tree | 9916f66509a29ed0f211cb2b6103ff1e76424c19 | |
| parent | 939d578ecc62b07efeb186576ab190fe0b766501 [diff] | |
| parent | abb0052289e58140d933b29491f59e4be0a19727 [diff] |
Merge branch 'x86/apic' into x86/platform Reason: Devicetree based ioapic setup depends on the apic changes. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>