Re: [PULL] drm-intel-next

Daniel Vetter
2014-10-21T12:43:28Z

On Tue, Oct 21, 2014 at 2:27 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> There's some simple merge conflicts with current upstream but nothing
> serious really, I can push out a merge point if you want to. As usual
> -nightly has the solution for you to peek at.

Sorrry I've lied, there's an annoying conflict that git somehow
doesn't spot which results in a function declaration that's no longer
used being left behind. I'll prep a new pull with the merge on top.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch