Merge branch 'linus' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Tue, 13 Apr 2010 12:12:17 +0000 (14:12 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 13 Apr 2010 12:12:17 +0000 (14:12 +0200)
Reason: Get the upstream IRQF_DISABLED related changes.

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

Simple merge