diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-10-22 10:24:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-22 10:24:21 +1000 |
| commit | c2a75586ff27ee7636bb2bf33ee66992a6603e49 (patch) | |
| tree | 0cd93a96f3d1b639e2091c8910831dd1f0e497a1 /drivers/rtc/rtc-wm8350.c | |
| parent | 37363bc03e0b53c45e98f34e35c75b55611417e0 (diff) | |
| parent | 18e9345b0db9fe7bd18c3c43967789fe0a2fdb52 (diff) | |
| download | op-kernel-dev-c2a75586ff27ee7636bb2bf33ee66992a6603e49.zip op-kernel-dev-c2a75586ff27ee7636bb2bf33ee66992a6603e49.tar.gz | |
Merge tag 'drm-intel-fixes-2015-10-16' of git://anongit.freedesktop.org/drm-intel into drm-fixes
The revert dance could use some explanation: we had stuff fixed in
-next, and initially backported one commit to v4.3. Now, turns out we
need more fixes, and we could cherry-pick them all without conflicts if
we reverted the backported one first. So did that to not have to edit
and backport them all.
* tag 'drm-intel-fixes-2015-10-16' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Add primary plane to mask if it's visible
drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()
drm/i915: Assign hwmode after encoder state readout
Revert "drm/i915: Add primary plane to mask if it's visible"
drm/i915: Deny wrapping an userptr into a framebuffer
drm/i915: Enable DPLL VGA mode before P1/P2 divider write
drm/i915: Restore lost DPLL register write on gen2-4
drm/i915: Flush pipecontrol post-sync writes
drm/i915: Fix kerneldoc for i915_gem_shrink_all
Diffstat (limited to 'drivers/rtc/rtc-wm8350.c')
0 files changed, 0 insertions, 0 deletions
