diff options
| author | Dave Airlie | 2013-06-05 14:35:08 +1000 |
|---|---|---|
| committer | Dave Airlie | 2013-06-05 14:35:08 +1000 |
| commit | 0e32fde96bb9c1fa8fa477e52c1d6ae2f4995cea (patch) | |
| tree | 41fd0184ff07ec33896c742251d971d655706331 /net/key | |
| parent | 943079e111bde93ed972d21618d1d73e75ba0d09 (diff) | |
| parent | d40ee48acde16894fb3b241d7e896d5fa84e0f10 (diff) | |
Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Multiple nouveau regression fixes, hdmi audio, s/r and dac load detection
* 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nv50/kms: use dac loadval from vbios, where it's available
drm/nv50/disp: force dac power state during load detect
drm/nv50-nv84/fifo: fix resume regression introduced by playlist race fix
drm/nv84/disp: Fix HDMI audio regression
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions