Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Browse source

Backmerge drm-next one more because Dave fumbled the conflict
resolution slightly and I didn't notice it. We need Zhenyu's hotfix
before he can assemble the gvt pull ...

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

...

This commit is contained in:

Daniel Vetter 2017-03-29 09:20:33 +02:00

parent 9a86cda07a 8bcad07a45

commit c276be4f38

1 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

drivers/gpu/drm/i915/gvt/cmd_parser.c

View file