merge linus into release branch

Conflicts:

	drivers/acpi/acpi_memhotplug.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 8f01e0f1d847..46801f5ec03f 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -472,7 +472,7 @@ void __init ipic_init(phys_addr_t phys_addr,
         ipic_write(primary_ipic->regs, IPIC_SEMSR, temp);
 
         for (i = 0 ; i < NR_IPIC_INTS ; i++) {
-                irq_desc[i+irq_offset].handler = &ipic;
+                irq_desc[i+irq_offset].chip = &ipic;
                 irq_desc[i+irq_offset].status = IRQ_LEVEL;
         }