Merge remote-tracking branch 'origin/master' into drm-misc-next-fixes
authorSean Paul <seanpaul@chromium.org>
Mon, 19 Jun 2017 17:39:28 +0000 (13:39 -0400)
committerSean Paul <seanpaul@chromium.org>
Mon, 19 Jun 2017 17:39:28 +0000 (13:39 -0400)
Backmerge 4.12-rc6 into -next-fixes. -next-fixes will contain find patches
for 4.13 merge window


Trivial merge