On Wed, Apr 28, 2010 at 04:07:41PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging-next tree got a conflict in > drivers/staging/comedi/drivers/cb_das16_cs.c between commitc > 8bf6e66c254bba7d0ea3f5d02420776dceac657 ("") from the pcmcia tree and > commit 6ea17dd43c1153f99920e66f806d86f4e83583cc ("Staging: comedi: > cb_das16_cs: fixed multiple brace coding style issues") from the > staging-next tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Looks great, thanks, 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