On Fri, Aug 01, 2014 at 04:21:42PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> MAINTAINERS between commit 7eea35fe3df8 ("[media] MAINTAINERS: Update
> go7007 pattern") from the v4l-dvb tree and commit 0d317b91d6d8
> ("staging: frontier: remove driver") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, 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
