Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 3 Jun 2016 04:07:42 +0000 (14:07 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 3 Jun 2016 04:07:42 +0000 (14:07 +1000)
"I have accumulated some cleanup patches for HDLCD, partly triggered by
Daniel Vetter's work on non-blocking atomic operations, that I would like
to integrate into v4.7. My first patch is important for the newly enabled
hibernate option for AArch64 on Juno, the others are fixing behaviour in
HDLCD and adding a debugfs entry to help track the underlying framebuffer
usage. I'm also taking one of Daniel's patches from his non-blocking series
to help with the integration of his patches later."

* 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld:
  drm: hdlcd: Add information about the underlying framebuffers in debugfs
  drm: hdlcd: Cleanup the atomic plane operations
  drm/hdlcd: Fix up crtc_state->event handling
  drm: hdlcd: Revamp runtime power management


Trivial merge