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

Browse Source

Pull in Dave's drm-next pull request to have a clean base for 4.6.
Also, we need the various atomic state extensions Maarten recently
created.

Conflicts are just adjacent changes that all resolve to nothing in git
diff.

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

...

This commit is contained in:

Daniel Vetter

2016-01-18 08:04:23 +01:00

parent 2d7f3bdb2c 1df59b8497

commit 2da80b57c6

1183 changed files with 85689 additions and 28287 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

943

Documentation/DocBook/gpu.tmpl

File diff suppressed because it is too large Load Diff