Skip to content
Commit 0a87a2db authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 7226572d fcf3aac5
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment