Merge tag 'v3.12-rc6' into devel

Linux 3.12-rc6

Conflicts:
	drivers/gpio/gpio-lynxpoint.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpio/gpio-lynxpoint.c
index 21603e6,41b5913..a080474
--- 1/drivers/gpio/gpio-lynxpoint.c
--- 2/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@@ -248,15 -248,15 +248,16 @@@ static void lp_gpio_irq_handler(unsigne
        struct lp_gpio *lg = irq_data_get_irq_handler_data(data);
        struct irq_chip *chip = irq_data_get_irq_chip(data);
        u32 base, pin, mask;
-       unsigned long reg, pending;
+       unsigned long reg, ena, pending;
 -      unsigned virq;
  
        /* check from GPIO controller which pin triggered the interrupt */
        for (base = 0; base < lg->chip.ngpio; base += 32) {
                reg = lp_gpio_reg(&lg->chip, base, LP_INT_STAT);
+               ena = lp_gpio_reg(&lg->chip, base, LP_INT_ENABLE);
  
-               while ((pending = inl(reg))) {
+               while ((pending = (inl(reg) & inl(ena)))) {
 +                      unsigned irq;
 +
                        pin = __ffs(pending);
                        mask = BIT(pin);
                        /* Clear before handling so we don't lose an edge */

diff --cc drivers/gpio/gpiolib.c
Simple merge