Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux...
authorDave Airlie <airlied@redhat.com>
Wed, 18 Jun 2014 05:50:58 +0000 (15:50 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 18 Jun 2014 05:50:58 +0000 (15:50 +1000)
commit571366284b50c93ba4ba5f13fad3f2430024c613
tree435aa8dfb7f7b035c2956a722886bd6e341154cd
parent844f22823e14964d9973626cb9710299a9626abb
parent242a42eadfc17448a0d5b2ffc0cb191c8b51971a
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

couple more DP regression fixes.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/disp: fix oops in destructor with headless cards
  drm/gf117/i2c: no aux channels on this chipset