| commit | 72a3697097b8dc92f5b8362598f5730a9986eb83 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Dec 17 20:24:02 2014 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Dec 17 20:24:02 2014 +0100 |
| tree | 221a922470b6eb5c37a01ee2b2e5ae0c2070bbea | |
| parent | 22b8b13b6f436ffbb6e540f5f8039b1084a72794 [diff] | |
| parent | dafffda023b04f87e695dfcf5448e4da964d2e95 [diff] |
Merge branch 'topic/core-stuff' into topic/atomic-core Backmerge my drm-misc branch because of conflicts. Just simple stuff but better to clear this out before I merge the other atomic patches. Conflicts: drivers/gpu/drm/drm_crtc.c drivers/gpu/drm/drm_edid.c Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>