From: Dave Airlie Date: Fri, 29 Jan 2016 00:02:35 +0000 (+1000) Subject: Merge tag 'drm-vc4-fixes-2015-01-19' of http://github.com/anholt/linux into drm-fixes X-Git-Tag: v4.5-rc2~27^2~2 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=2ad14a6ca2f5d6e73e58c463e1b9dacffda3387a Merge tag 'drm-vc4-fixes-2015-01-19' of github.com/anholt/linux into drm-fixes This pull request just includes the !CONFIG_PM_SLEEP build fix for vc4. * tag 'drm-vc4-fixes-2015-01-19' of http://github.com/anholt/linux: drm/vc4: Remove broken attempt at GPU reset using genpd. --- 2ad14a6ca2f5d6e73e58c463e1b9dacffda3387a