[git pull] drm tree for 4.2

[Linus Torvalds]

On Fri, Jun 26, 2015 at 1:37 PM, Dave Airlie <airlied at gmail.com> wrote:
>
> No generally Linus likes to do his own merges with hints from us.
>
> unless it's really tricky.

Yup. And this time all the merges were trivial. My merge ended up
differing from Dave's simply because of an ordering of statements that
could be done in either direction, and the "natural" direction ended
up depending mainly on which way the merge was done (ie me pulling
Dave's tree, or Dave pulling mine).

I'm running it on my machine now, just waiting for the allmodconfig
build to also finish before pushing it out.

                          Linus