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: omap-for-v3.16/fixes-rc4~80^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=571366284b50c93ba4ba5f13fad3f2430024c613;p=pandora-kernel.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
Reading git-diff-tree failed