On Wed, May 12, 2010 at 04:03:52PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging-next tree got a conflict in > drivers/staging/wlags49_h2/wl_cs.c between commit > c8df2d45846e374de8ff601b9ea0537becfe75ca ("pcmcia: re-work > pcmcia_request_irq()") from the pcmcia tree and commit ("") from the > staging-next tree. > > I fixed it up (see below) and can carry the fix as necessary. Heh, I just hacked that driver up to build properly, odds are it doesn't run :) But your fix looks fine, thanks for it. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html