| commit | 3d0f8536cd24079a68a53266517f6ab85d7d6f5b | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Nov 14 06:24:50 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Nov 14 06:24:50 2014 +1000 |
| tree | 37f64c68c02b46a3ffdba17284b7a74932e8b246 | |
| parent | 64e5fcc68baaf5301af2c4d28229fcfeb99c009a [diff] | |
| parent | eae7382bc5547391e72f8cde83f5e2be9c359d5b [diff] |
Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes One modesetting, one gk20a fix. * 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/nv50/disp: Fix modeset on G94 drm/gk20a/fb: fix setting of large page size bit