Merge branch 'linus' into irq/genirq

author Ingo Molnar <mingo@elte.hu>

Mon, 2 Mar 2009 21:08:56 +0000 (22:08 +0100)

committer Ingo Molnar <mingo@elte.hu>

Mon, 2 Mar 2009 21:08:56 +0000 (22:08 +0100)
author Ingo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:08:56 +0000 (22:08 +0100)
committer Ingo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:08:56 +0000 (22:08 +0100)
diff --cc kernel/irq/chip.c
Simple merge
diff --cc kernel/irq/manage.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 2 Mar 2009 21:08:56 +0000 (22:08 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 2 Mar 2009 21:08:56 +0000 (22:08 +0100)
		1	2
kernel/irq/chip.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	patch \|	diff1 \|	diff2 \|	blob \| history