Merge tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 May 2017 00:30:44 +0000 (17:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 May 2017 00:30:44 +0000 (17:30 -0700)
commitbdc713bf5674bc6a881bd05c85e2a0f811b409b3
tree7fc6e0fd5bcef8b2ba6837b7f7d451fc7c34625f
parent1062ae4982cabbf60f89b4e069fbb7def7edc8f7
parent8676df503092dcdd757b1120fab03bfbce0ae1e7
Merge tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux

Pull drm CoC pointer from Dave Airlie:
 "Small supplementary pull request. I didn't want anyone saying we snuck
  this in in a the middle of a big pile of changes, so here is a clearly
  separate pull request documenting the code of conduct introduced for
  freedesktop.org and how it relates to dri-devel community"

* tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux:
  drm: Document code of conduct