From: Dave Airlie <airlied@redhat.com>
Date: Thu, 2 Apr 2015 23:27:48 +0000 (+1000)
Subject: Merge tag 'drm-intel-fixes-2015-04-02' of git://anongit.freedesktop.org/drm-intel... 
X-Git-Tag: firefly_0821_release~176^2~2069^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3fa50dc3be89f721f4dd64c38fd45d330f98c1f0;p=firefly-linux-kernel-4.4.55.git

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
---

3fa50dc3be89f721f4dd64c38fd45d330f98c1f0