| commit | 5d0cf3d6e07957502dae8602e2f96eb6790ddc13 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Jun 18 11:44:05 2014 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Jun 18 11:44:05 2014 +0200 |
| tree | 6360d831a14c8e3344dc60034c0458a151d591d6 | |
| parent | 27b6c122512ca30399bb1b39cc42eda83901f304 [diff] | |
| parent | 8abdc17941c71b37311bb93876ac83dce58160c8 [diff] |
Merge branch 'topic/soix' into drm-intel-next-queued Jesse's SOix work required some patches from acpi-next, so pull it in through a topic barnch. Conflicts: drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>