Merge branch 'for-linus' into for-next

 Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	sound/soc/intel/skylake/skl.h

1 files changed, 1 insertions, 0 deletions

diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 3d167eed0f59..deec048f00c7 100644
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -70,6 +70,7 @@ struct skl {
 	struct list_head ppl_list;
 
 	const char *fw_name;
+	const struct firmware *tplg;
 
 	int supend_active;
 };