Merge tag 'drm-vc4-fixes-2015-01-19' of http://github.com/anholt/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 29 Jan 2016 00:02:35 +0000 (10:02 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 29 Jan 2016 00:02:35 +0000 (10:02 +1000)
commit2ad14a6ca2f5d6e73e58c463e1b9dacffda3387a
tree26c5e2287b04c71c0d179ed4234a1cf9c1e84f96
parent2081e78a5cb2e14e4980a8aaddd8e4899cc7557b
parent8483d152db61c5baf5452b844ef65b96ee9a6cfb
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.