Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

diff --cc drivers/gpu/drm/tegra/drm.h
Simple merge

diff --cc drivers/gpu/drm/tegra/hdmi.c
index 78bc7c9,3ce5519..47c5597
--- 1/drivers/gpu/drm/tegra/hdmi.c
--- 2/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@@ -18,12 -19,9 +19,9 @@@
  
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_crtc.h>
 -#include <drm/drm_crtc_helper.h>
 +#include <drm/drm_probe_helper.h>
  
- #include <sound/hda_verbs.h>
- 
- #include <media/cec-notifier.h>
- 
+ #include "hda.h"
  #include "hdmi.h"
  #include "drm.h"
  #include "dc.h"

diff --cc drivers/gpu/drm/tegra/sor.c
Simple merge