From: Linus Torvalds 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-Tag: v4.12-rc1~86 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdc713bf5674bc6a881bd05c85e2a0f811b409b3;p=platform%2Fkernel%2Flinux-exynos.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