| commit | e800cab3a72892134bde4b72ada063a75683c66b | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Oct 20 16:14:19 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Oct 20 16:14:19 2014 +1000 |
| tree | a720f47b041bbfd4adffbb619ce1598c333d0f54 | |
| parent | bee6bd0ad25f396095f0522fd441edfebd25a0cf [diff] | |
| parent | 67e26e41ff8aa514826dae79f0b10169b5ba93b4 [diff] |
Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes two nouveau fixes. * 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau: fix regression on agp boards drm/gt215/gr: fix initialisation on gddr5 boards