[lkml]   [2012]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the pcmcia tree with the arm tree
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

The former removed the code modified by the latter, so I did that.
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-03-05 04:25    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean