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)
commit1724c7c0c9494dcbdd7f630f29e1e8427cb231d1
treed7c7ad032289cdf0633feee4bd6ec5800b666ca7
parent7f5d6dac548b983702dd7aac1d463bd88dff50a8
parentef954844c7ace62f773f4f23e28d2d915adc419f
Merge origin/master into drm-misc-fixes

Backmerge 4.13-rc5 into drm-misc-fixes, it was getting a
little stale.

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