diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 14:55:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 14:55:31 -0800 |
| commit | d004e4d3322340b6433caaef4a47ab8c933afb70 (patch) | |
| tree | f9ba6e6cb960fddb09da7c322d4b1dcb3f4b0e6f /init/main.c | |
| parent | Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
| parent | Merge branch 'linus' into x86/apic-cleanups (diff) | |
| download | linux-dev-d004e4d3322340b6433caaef4a47ab8c933afb70.tar.xz linux-dev-d004e4d3322340b6433caaef4a47ab8c933afb70.zip | |
Merge branch 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: apic: Cleanup and simplify setup_local_APIC()
x86: Further simplify mp_irq info handling
x86: Unify 3 similar ways of saving mp_irqs info
x86, ioapic: Avoid writing io_apic id if already correct
x86, x2apic: Don't map lapic addr for preenabled x2apic systems
x86, sfi: Use register_lapic_address()
x86, apic: Use register_lapic_address() in init_apic_mapping()
x86, apic: Remove early_init_lapic_mapping()
x86, apic: Unify identical register_lapic_address() functions
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions