From: Dave Airlie Date: Fri, 3 Jun 2016 04:07:42 +0000 (+1000) Subject: Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes X-Git-Tag: v4.7-rc2~4^2~4 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6572c8c637278d64dfd355e84a6dcb64b9d6cf28;p=linux.git Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes "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 --- 6572c8c637278d64dfd355e84a6dcb64b9d6cf28