From: Dave Airlie <airlied@redhat.com>
Date: Wed, 21 May 2014 23:14:50 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: v3.15-rc7~11^2~1
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=763b2573cf59da8f906b9f2c8a2d437482761005;p=cascardo%2Flinux.git

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
---

763b2573cf59da8f906b9f2c8a2d437482761005