Merge origin/master into drm-misc-fixes
authorSean Paul <seanpaul@chromium.org>
Mon, 14 Aug 2017 17:14:36 +0000 (13:14 -0400)
committerSean Paul <seanpaul@chromium.org>
Mon, 14 Aug 2017 17:14:36 +0000 (13:14 -0400)
Backmerge 4.13-rc5 into drm-misc-fixes, it was getting a
little stale.

Signed-off-by: Sean Paul <seanpaul@chromium.org>

Trivial merge