tree 7686eb472ca297e6375a744e3e07cc84b1f4343c
parent b9aa8510dd68143cc9d66c520002b638983e254b
parent b46b28d339164c8c74020eace97163e2e478ef34
author Dave Airlie <airlied@redhat.com> 1381298965 +1000
committer Dave Airlie <airlied@redhat.com> 1381298965 +1000

Merge remote-tracking branch 'nouveau/drm-nouveau-next' into drm-fixes

Disable MSIs for now until we can fix them up

* nouveau/drm-nouveau-next:
  drm/nouveau/mc: disable msi support by default, it's busted in tons of places