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)
commit6545f3189707c9105fcf160c2da2ddd2dacca331
tree64cd70fdb3f6ec2117c67170dae6c81203e58f66
parent8e73a108acdb7c30ec84edcde1c550ad9448b6ac
parenta814a29d7bbfdfe56fe1bb9641a185077066eb9f
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