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)
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


Trivial merge