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)
commitd4e0045c4ed300781d2d4cbab57d05ed5e665a37
tree925bab41d7906329392aa12c8fa7bcc70f64ca46
parent2d7b56378d32b0cf006f8944cbba4046df45dd25
parent41f1830f5a7af77cf5c86359aba3cbd706687e52
Merge remote-tracking branch 'origin/master' into drm-misc-next-fixes

Backmerge 4.12-rc6 into -next-fixes. -next-fixes will contain find patches
for 4.13 merge window