lkml.org 
[lkml]   [2012]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    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
    tree.

    The former removed the code modified by the latter, so I did that.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-03-05 04:25    [W:0.021 / U:0.448 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site