merge linus into release branch

Conflicts:

	drivers/acpi/acpi_memhotplug.c

1 files changed, 9 insertions, 9 deletions

diff --git a/include/asm-powerpc/hw_irq.h b/include/asm-powerpc/hw_irq.h
index ce0f7db63c16..d40359204aba 100644
--- a/include/asm-powerpc/hw_irq.h
+++ b/include/asm-powerpc/hw_irq.h
@@ -86,27 +86,27 @@ static inline void local_irq_save_ptr(unsigned long *flags)
 #define mask_irq(irq)                                           \
         ({                                                      \
                 irq_desc_t *desc = get_irq_desc(irq);           \
-                if (desc->handler && desc->handler->disable)    \
-                        desc->handler->disable(irq);            \
+                if (desc->chip && desc->chip->disable)  \
+                        desc->chip->disable(irq);               \
         })
 #define unmask_irq(irq)                                         \
         ({                                                      \
                 irq_desc_t *desc = get_irq_desc(irq);           \
-                if (desc->handler && desc->handler->enable)     \
-                        desc->handler->enable(irq);             \
+                if (desc->chip && desc->chip->enable)   \
+                        desc->chip->enable(irq);                \
         })
 #define ack_irq(irq)                                            \
         ({                                                      \
                 irq_desc_t *desc = get_irq_desc(irq);           \
-                if (desc->handler && desc->handler->ack)        \
-                        desc->handler->ack(irq);                \
+                if (desc->chip && desc->chip->ack)      \
+                        desc->chip->ack(irq);           \
         })
 
-/* Should we handle this via lost interrupts and IPIs or should we don't care like
- * we do now ? --BenH.
+/*
+ * interrupt-retrigger: should we handle this via lost interrupts and IPIs
+ * or should we not care like we do now ? --BenH.
  */
 struct hw_interrupt_type;
-static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {}
 
 #endif  /* __KERNEL__ */
 #endif  /* _ASM_POWERPC_HW_IRQ_H */