summaryrefslogtreecommitdiff
path: root/proto_vlan.h
diff options
context:
space:
mode:
Diffstat (limited to 'proto_vlan.h')
0 files changed, 0 insertions, 0 deletions
x/net-next.git/diff/?id=6572c8c637278d64dfd355e84a6dcb64b9d6cf28&id2=a9bf7d60c273763d3f0f4f991bd96fbc411bfd73'>diff)parentf6c68b4bd4a98033d1e79479212bbd376e145728 (diff)
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
Diffstat