| commit | e19b9137142988bec5a76c5f8bdf12a77ea802b0 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Mar 18 09:43:56 2014 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Mar 18 09:43:56 2014 +0100 |
| tree | b36c83fa93da7f18c1331252fb82a87431697443 | |
| parent | 2fae6a860ca9adb0c881f6dcd633df775c2520e9 [diff] | |
| parent | e40d641099213145a034981e646dc2180a488152 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next Conflicts: drivers/gpu/drm/i915/Makefile Makefile cleanup in drm-intel-next conflicts with a build-fix to move intel_opregion under CONFIG_ACPI. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>