diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 20:00:55 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-23 20:01:01 +0100 |
| commit | cb4cfd568c1181501419b89d916e8523107c0106 (patch) | |
| tree | 9916f66509a29ed0f211cb2b6103ff1e76424c19 /arch/x86/kernel/e820.c | |
| parent | x86: OLPC: Make OLPC=n build again (diff) | |
| parent | x86: ioapic: Move trigger defines to io_apic.h (diff) | |
| download | linux-cb4cfd568c1181501419b89d916e8523107c0106.tar.xz linux-cb4cfd568c1181501419b89d916e8523107c0106.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/e820.c')
0 files changed, 0 insertions, 0 deletions