Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] mpc52xx_pic: fix main interrupt masking

+2 -2
+2 -2
arch/powerpc/platforms/52xx/mpc52xx_pic.c
··· 128 128 129 129 pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq); 130 130 131 - io_be_setbit(&intr->main_mask, 15 - l2irq); 131 + io_be_setbit(&intr->main_mask, 16 - l2irq); 132 132 } 133 133 134 134 static void mpc52xx_main_unmask(unsigned int virq) ··· 141 141 142 142 pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq); 143 143 144 - io_be_clrbit(&intr->main_mask, 15 - l2irq); 144 + io_be_clrbit(&intr->main_mask, 16 - l2irq); 145 145 } 146 146 147 147 static struct irq_chip mpc52xx_main_irqchip = {