Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@redhat.com>
Wed, 21 May 2014 23:14:50 +0000 (09:14 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 21 May 2014 23:14:50 +0000 (09:14 +1000)
fixes nasty panel bleeding bug.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup
  drm/nvd9/therm: handle another kind of PWM fan


Trivial merge