linux-next: manual merge of the pcmcia tree with the arm tree

[Stephen Rothwell]

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/pcmcia/soc_common.c between commit a7670151a48c ("PCMCIA:
soc_common: remove soc_pcmcia_*_irqs functions") from the arm tree and
commit d571c79e86fa ("pcmcia: irq: Remove IRQF_DISABLED") from the pcmcia
tree.

The former removed the code modified by the latter, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature