Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
              on a handful of tracing fixes present in .30-rc5-almost.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 9ba20d985dda..998c5c45587e 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -73,9 +73,9 @@ static int omap_check_spurious(unsigned int irq)
         u32 sir, spurious;
 
         sir = intc_bank_read_reg(&irq_banks[0], INTC_SIR);
-        spurious = sir >> 6;
+        spurious = sir >> 7;
 
-        if (spurious > 1) {
+        if (spurious) {
                 printk(KERN_WARNING "Spurious irq %i: 0x%08x, please flush "
                                         "posted write for irq %i\n",
                                         irq, sir, previous_irq);