[git pull] drm merge for rc1 (part 1)

[David Howells]

David Howells <dhowells at redhat.com> wrote:

> Linus Torvalds <torvalds at linux-foundation.org> wrote:
> 
> > Ok, as usual I actually wanted to do the merge myself despite the
> > annoying conflicts (this *really* is the last time I will ever accept
> > any header file "cleanups" - they simply aren't worth the pain).
> 
> There was a reason I asked you to pull the patches at the *end* of the merge
> window,

Okay, I owe you an apology...  I forgot to request that you pull at the end of
the merge window when I asked you to pull the preparatory patches instead.

David