[git pull] drm tree for 4.2

[Dave Airlie]

On 26 June 2015 at 18:05, Christian König <deathsimple at vodafone.de> wrote:
> Hey Dave,
>
> I'm not 100% sure, but didn't you wanted to send this pull request out for
> drm-next-merged instead of drm-next?
>
> Cause I'm still getting merge conflicts when I try to merge 4.1 into
> drm-next.

No generally Linus likes to do his own merges with hints from us.

unless it's really tricky.

Dave.