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)
commit7c7145f6acc68100dbdc5d3c5c64fe3af1c99c89
tree5e93e3eb4787229032f1df222fa490112f4b0c32
parent92d6b71ab906be706f3679353b30a8d2c3831144
parent0d0fb0f9c5fddef4a10242fe3337f00f528a3099
Merge branch 'linus' into irq/core

Reason: Get the upstream IRQF_DISABLED related changes.

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