diff options
| author | Dave Airlie | 2014-01-30 10:46:06 +1000 |
|---|---|---|
| committer | Dave Airlie | 2014-01-30 10:46:06 +1000 |
| commit | ef64cf9d06049e4e9df661f3be60b217e476bee1 (patch) | |
| tree | 6c375f94bb68dc9f5e273dd85ce76d3f88cbbb50 /drivers/net | |
| parent | 279b9e0cc30052a1acb6e124120b754eb20b35aa (diff) | |
| parent | f3980dc50c5117a952baee7135aae50d48304af3 (diff) | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
more fixes for nouveau.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: resume display if any later suspend bits fail
drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip
drm/nouveau: implement hooks for needed for drm vblank timestamping support
drm/nouveau/disp: add a method to fetch info needed by drm vblank timestamping
drm/nv50: fill in crtc mode struct members from crtc_mode_fixup
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions