From: Dave Airlie Date: Wed, 19 Apr 2017 01:07:14 +0000 (+1000) Subject: Merge tag 'v4.11-rc7' into drm-next X-Git-Tag: v4.12-rc1~116^2~6 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=856ee92e8602bd86d34388ac08381c5cb3918756;p=users%2Fjedix%2Flinux-maple.git Merge tag 'v4.11-rc7' into drm-next Backmerge Linux 4.11-rc7 from Linus tree, to fix some conflicts that were causing problems with the rerere cache in drm-tip. --- 856ee92e8602bd86d34388ac08381c5cb3918756