FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-26 04:35:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/arch/x86/include
History
Ingo Molnar 4420471f14 Merge branch 'x86/apic' into irq/numa 
Conflicts:
	arch/x86/kernel/apic/io_apic.c

Merge reason: non-trivial interaction between ongoing work in io_apic.c
              and the NUMA migration feature in the irq tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-05-01 19:02:50 +02:00
..
asm
Merge branch 'x86/apic' into irq/numa
2009-05-01 19:02:50 +02:00