Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes

single nouveau fix.

* 'linux-4.4' of git://github.com/skeggsb/linux:
  drm/nouveau/bios/fan: hardcode the fan mode to linear
This commit is contained in:
Dave Airlie 2015-12-19 13:25:42 +10:00
commit 6545f31897