| commit | 967ad7f1489da7babbe0746f81c283458ecd3f84 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Oct 10 12:44:43 2013 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Oct 10 12:44:43 2013 +0200 |
| tree | 812608fd6efcfe81096bd51b1ec1c2a4167385f6 | |
| parent | d7bf63f2465b3b6335dd66ffbf387768d81a59d5 [diff] | |
| parent | 6aba5b6cf098ba305fc31b23cc14114a16768d22 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next The conflict in intel_drv.h tripped me up a bit since a patch in dinq moves all the functions around, but another one in drm-next removes a single function. So I'ev figured backing this into a backmerge would be good. i915_dma.c is just adjacent lines changed, nothing nefarious there. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/intel_drv.h Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>