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)
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.


Trivial merge