merge linus into release branch

Conflicts:

	drivers/acpi/acpi_memhotplug.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/isdn/hardware/avm/b1pcmcia.c
index 9746cc5ffff8..ad5025155b4e 100644
--- a/drivers/isdn/hardware/avm/b1pcmcia.c
+++ b/drivers/isdn/hardware/avm/b1pcmcia.c
@@ -82,7 +82,7 @@ static int b1pcmcia_add_card(unsigned int port, unsigned irq,
         card->irq = irq;
         card->cardtype = cardtype;
 
-        retval = request_irq(card->irq, b1_interrupt, 0, card->name, card);
+        retval = request_irq(card->irq, b1_interrupt, SA_SHIRQ, card->name, card);
         if (retval) {
                 printk(KERN_ERR "b1pcmcia: unable to get IRQ %d.\n",
                        card->irq);