Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Sat, 19 Dec 2015 03:25:42 +0000 (13:25 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 19 Dec 2015 03:25:42 +0000 (13:25 +1000)
single nouveau fix.

* 'linux-4.4' of git://github.com/skeggsb/linux:
  drm/nouveau/bios/fan: hardcode the fan mode to linear


Trivial merge