Merge branch 'irq/for-mips' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Thu, 10 Feb 2011 23:26:54 +0000 (00:26 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 10 Feb 2011 23:27:03 +0000 (00:27 +0100)
Reason: irq/for-mips is provided for mips to make core independent
        progress. Merge it into irq/core to avoid conflicts

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
kernel/irq/manage.c

Simple merge