Merge branch 'linux-4.4' of https://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Wed, 9 Dec 2015 04:15:58 +0000 (14:15 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 9 Dec 2015 04:15:58 +0000 (14:15 +1000)
commitff6e0fd55ef24e62efe5c9ab8327312164554250
treec39ab24cb640e09ca0f8c16be2cab6531e9b2981
parentaa53685549a2cfb5f175b0c4a20bc9aa1e5a1b85
parent714a98fc3f20934ce8098667b809de954ebab93c
Merge branch 'linux-4.4' of https://github.com/skeggsb/linux into drm-fixes

Just the one commit I mentioned earlier, making the PGOB workaround the
default.

* 'linux-4.4' of https://github.com/skeggsb/linux:
  drm/nouveau/pmu: remove whitelist for PGOB-exit WAR, enable by default