| commit | 0a87a2db485a1456b7427914969c0e8195a1bbda | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Jan 12 23:07:46 2015 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Jan 12 23:07:46 2015 +0100 |
| tree | 8d0186672af22c6ee76118c471881cd66a36502d | |
| parent | 7226572d8ed48f7e1aa9de5383d919490d6e9a0c [diff] | |
| parent | fcf3aac5fc307f0cae429f5844ddc25761662858 [diff] |
Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued Conflicts: drivers/gpu/drm/i915/intel_runtime_pm.c Separate branch so that Takashi can also pull just this refactoring into sound-next. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>