On Fri, Mar 04, 2011 at 04:38:56PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/dabusb/dabusb.c and drivers/staging/dabusb/dabusb.h > between commit f8f4a7f5c1219571acf55f3889138b594e5b3b68 ("[media] dabusb: > remove obsolete driver") from the v4l-dvb tree and commit > 868788278eaa5b841ec1a810b41e156f5fba0ab5 ("Staging: dabusb: fixed coding > style issues") from the staging tree. > > I removed the files. That sounds correct, 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