Re: linux-next: manual merge of the drm tree with Linus' tree

Dave Airlie
2009-10-08T03:38:39Z

>
> Got similar conflicts today ... any way you can sort this out, please?

I'm testing the result of a merge at the moment, but I don't want to be
premature with pushing it out.

hopefully be there tomorrow.

Dave.