From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 May 2017 00:30:44 +0000 (-0700)
Subject: Merge tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bdc713bf5674bc6a881bd05c85e2a0f811b409b3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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
---

bdc713bf5674bc6a881bd05c85e2a0f811b409b3