| commit | ca295e50c2805865fd1ac8916d15ab0b551d957a | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Jun 20 12:02:38 2011 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Jun 20 12:02:38 2011 +1000 |
| tree | 765283c65226a53dea46eb1aa364a0471068fca1 | |
| parent | 682f1a54a03513fd6bcede56845f1ba21f48c182 [diff] | |
| parent | b16a5a18ff994532120c1d18e678bbc5fb477b62 [diff] |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes * 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau: fix assumption that semaphore dmaobj is valid in x-chan sync drm/nv50/disp: fix gamma with page flipping overlay turned on drm/nouveau/pm: Prevent overflow in nouveau_perf_init() drm/nouveau: fix big-endian switch