manual merge of irq/core

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc include/linux/interrupt.h
index 2e88580194f0238430de1255c5a63f99bf975e0a,2cee1761c77d21a737c425b23109ce677b4f5657..150dde04cf4fccb8390ae2a8309a9c4688e95cbe
--- 1/include/linux/interrupt.h
--- 2/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@@ -59,12 -55,7 +57,11 @@@
   * IRQF_NO_THREAD - Interrupt cannot be threaded
   * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device
   *                resume time.
 + * IRQF_COND_SUSPEND - If the IRQ is shared with a NO_SUSPEND user, execute this
 + *                interrupt handler after suspending interrupts. For system
 + *                wakeup devices users need to implement wakeup detection in
 + *                their interrupt handlers.
   */
- #define IRQF_DISABLED         0x00000020
  #define IRQF_SHARED           0x00000080
  #define IRQF_PROBE_SHARED     0x00000100
  #define __IRQF_TIMER          0x00000200

diff --cc kernel/irq/manage.c
Simple merge