-next merged with Linus tree

[Dave Airlie]

Hi,

I've just merged Linus tree into drm-next and fixes up the conflicts,
some in i915, one in radeon.

Can you guys check that they look correct after it?

I'll leave it just on my drm-next branch for now.

Thanks,
Dave.