| commit | 520e8bfc35066d4344adf13081e59bfde30aa36d | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Jul 29 17:21:38 2015 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Jul 29 17:21:38 2015 +1000 |
| tree | 3a956a8488c05d13110145f6d9db88e67858f0ae | |
| parent | eb8bb7774e6b433038632db5e9aafbf318edc6c1 [diff] | |
| parent | eb48b12ee5e05dd3ea473d008873f5228a63eb7a [diff] |
Merge branch 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Two more nouveau fixes. * 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/nouveau/ttm: fix tiled system memory with Maxwell drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads