| commit | 3fa50dc3be89f721f4dd64c38fd45d330f98c1f0 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Apr 03 09:27:48 2015 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Apr 03 09:27:48 2015 +1000 |
| tree | 1be7a2b44aecd1463d2b9266056f10f5d7a01455 | |
| parent | c7d748743f3ae73f1997a0a56e34674244b99a4a [diff] | |
| parent | 840a1cf0cd533f30da792527ca5ff6a023d4a727 [diff] |
Merge tag 'drm-intel-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel into drm-fixes one oops fixes and a 0-length allocation fix from next backported. * tag 'drm-intel-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel: drm/i915: Reject the colorkey ioctls for primary and cursor planes drm/i915: Skip allocating shadow batch for 0-length batches