Commits

Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks Conflicts: arch/x86/mm/ioremap.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks Conflicts: arch/x86/mm/ioremap.c Signed-off-by: Ingo Molnar <mingo@elte.hu>