]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/apic' into irq/numa
authorIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 10:17:30 +0000 (12:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 10:17:36 +0000 (12:17 +0200)
commitb101622aa168196513a48bab375efb6b66e87bd8
tree93f74ca002f5756c8e157611174f9540b5cf41c0
parent04162598b7809d5e07d7bd3e028969c9339fccdb
parent510fd5ace2dfe17832522fab8cbe4cecccd94a76
Merge branch 'x86/apic' into irq/numa

Merge reason: both topics modify the APIC code but were able to do it in
              parallel so far. An upcoming patch generates a conflict so
              merge them to avoid the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/apic/io_apic.c
drivers/pci/htirq.c
kernel/irq/handle.c