Hi Dan,
On Tue, 23 Jun 2015 14:51:48 +0300 Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:
>
> There was a merge problem in linux-next 4598d330d29e ('Merge
> remote-tracking branch 'drm/drm-next''). We need to add a break
> statement.
Thanks for noticing. I have fixed my merge resolution for the next
release and hopefully Linus will do it right when he merges the drm
tree (if it is still necessary).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpxJIjJs50_v.pgp
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
