From: Dave Airlie <airlied@gmail.com>
Date: Sun, 2 Sep 2012 10:22:04 +0000 (+1000)
Subject: Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/nouveau/linux-2... 
X-Git-Tag: v3.6-rc6~39^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f4fe968b61f530811d353c198f94bbeddefb26ee;p=linux.git

Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/nouveau/linux-2.6 into drm-fixes

These two fix the MacBook Pro 2012 Retina display.

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/nouveau/linux-2.6:
  drm/nv50-/gpio: initialise to vbios defaults during init
  drm/nvd0/disp: hopefully fix selection of 6/8bpc mode on DP outputs
---

f4fe968b61f530811d353c198f94bbeddefb26ee