Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued