diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-03-27 07:39:45 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-27 07:39:45 +1000 |
| commit | 9822393d23ba9129396ab9308dbb8ce10ae74751 (patch) | |
| tree | 7fc4ca225d5bd570d2e21a4e0fab5d9851da7fa1 /drivers/watchdog | |
| parent | 59a58cb34d3fe73e6c899cc5d9a87428ca662925 (diff) | |
| parent | 5f407751b0ca9bd876fe8f15ff28153661c6ba0a (diff) | |
Merge tag 'drm-intel-fixes-2015-03-26' of git://anongit.freedesktop.org/drm-intel into drm-fixes
This should cover the final warnings in -rc5 with two more backports
from our development branch (drm-intel-next-queued). They're the ones
from Daniel and Damien, with references to the reports.
This is on top of drm-fixes because of the dependency on the two earlier
fixes not yet in Linus' tree.
There's an additional regression fix from Chris.
* tag 'drm-intel-fixes-2015-03-26' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Fixup legacy plane->crtc link for initial fb config
drm/i915: Fix atomic state when reusing the firmware fb
drm/i915: Keep ring->active_list and ring->requests_list consistent
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions