Merge branch 'drm-fixes-rockchip-2015-12-02' of https://github.com/markyzq/kernel...
authorDave Airlie <airlied@redhat.com>
Wed, 2 Dec 2015 03:16:24 +0000 (13:16 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 2 Dec 2015 03:16:24 +0000 (13:16 +1000)
Rockchip fixes from Mark.

* 'drm-fixes-rockchip-2015-12-02' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: Use CRTC vblank event interface
  drm/rockchip: Fix module autoload for OF platform driver
  drm/rockchip: vop: fix window origin calculation
  drm/rockchip: unset pgoff when mmap'ing gems
  drm/rockchip: vop: Correct enabled clocks during setup


Trivial merge