| commit | 2a1235e53bed8fa111e1c1ee2e7d8d91efa71ebc | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed May 07 09:06:21 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed May 07 09:06:21 2014 +1000 |
| tree | 090be55eb5cd2156b3b8228a0f0251fff330f74a | |
| parent | 508200c5c076b20436a04cb264168095fe1b1f1a [diff] | |
| parent | c7e74306632c71398ce6db878cd316cb43072ffb [diff] |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes nouveau fixes. * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/gm107/gr: bump attrib cb size quite a bit drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip drm/nouveau/bios: fix shadowing from PROM on big-endian systems drm/nouveau/acpi: allow non-optimus setups to load vbios from acpi