From: Dave Airlie <airlied@redhat.com>
Date: Wed, 18 Jun 2014 05:50:58 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux... 
X-Git-Tag: firefly_0821_release~176^2~3725^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=571366284b50c93ba4ba5f13fad3f2430024c613;p=firefly-linux-kernel-4.4.55.git

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

571366284b50c93ba4ba5f13fad3f2430024c613