git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@elte.hu>
	Tue, 12 May 2009 10:17:30 +0000 (12:17 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 12 May 2009 10:17:36 +0000 (12:17 +0200)
commit	b101622aa168196513a48bab375efb6b66e87bd8
tree	93f74ca002f5756c8e157611174f9540b5cf41c0	tree \| snapshot
parent	04162598b7809d5e07d7bd3e028969c9339fccdb	commit \| diff
parent	510fd5ace2dfe17832522fab8cbe4cecccd94a76	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/pci/htirq.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/handle.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

arch/x86/kernel/apic/io_apic.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/htirq.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/handle.c	diff1 \|	diff2 \|	blob \| history