diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-01-30 01:46:06 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-01-30 01:46:06 +0100 |
| commit | ef64cf9d06049e4e9df661f3be60b217e476bee1 (patch) | |
| tree | 6c375f94bb68dc9f5e273dd85ce76d3f88cbbb50 /fs/nfs | |
| parent | Merge branch 'drm-next-3.14' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | drm/nouveau: resume display if any later suspend bits fail (diff) | |
| download | linux-ef64cf9d06049e4e9df661f3be60b217e476bee1.tar.xz linux-ef64cf9d06049e4e9df661f3be60b217e476bee1.zip | |
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 'fs/nfs')
0 files changed, 0 insertions, 0 deletions