Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/nouveau/linux-2...
authorDave Airlie <airlied@gmail.com>
Sun, 2 Sep 2012 10:22:04 +0000 (20:22 +1000)
committerDave Airlie <airlied@gmail.com>
Sun, 2 Sep 2012 10:22:04 +0000 (20:22 +1000)
commitf4fe968b61f530811d353c198f94bbeddefb26ee
treed669091866a1c9c919c845a018c4e85720b1a57f
parent4cbe5a555fa58a79b6ecbb6c531b8bab0650778d
parent991083ba60f89e717e3a4175be96d48a810e9eae
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