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)
commit763b2573cf59da8f906b9f2c8a2d437482761005
treeed144dcdc58ef14de401e8322bf6ca0bd5b93424
parent4b660a7f5c8099d88d1a43d8ae138965112592c7
parent0f1d360b2ee3a2a0f510d3f1bcd3f5ebe5d41265
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

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