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

[Dave Airlie]

> 
> 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/