tree a00eed33115598e29a47e43cd54950e5c41a7ef0
parent 776d1e38c5934ba4d2e300fe4208602babae4c1d
parent ace5a9b8dbc66ada0aa8c5f67b93527590822c7c
author Dave Airlie <airlied@redhat.com> 1353554445 +1000
committer Dave Airlie <airlied@redhat.com> 1353554461 +1000

Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

nouveau: one more regression fix.

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: use the correct fence implementation for nv50