linux_dsm_epyc7002/arch/x86/include
Thomas Gleixner d834a9dcec 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>
2010-12-09 18:17:25 +01:00
..
asm Merge branch 'x86/amd-nb' into x86/apic-cleanups 2010-12-09 18:17:25 +01:00