Merge branch 'for-linus' into for-next

Merge the recent HD-audio codec change for fixing recursive suspend
calls.

Conflicts:
	sound/pci/hda/hda_codec.c

diff --cc sound/pci/hda/hda_codec.c
index a8e7b00fe90d87aece5e63f8a35c36dcee4855b1,cebe2dfdd9842907923ae9d16e25ca165d49c6d9..d9fd439209df7e78501d3463205cffb5ec27dc89
--- 1/sound/pci/hda/hda_codec.c
--- 2/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@@ -3693,13 -3660,9 +3698,15 @@@ static void hda_call_codec_resume(struc
                snd_hda_codec_resume_amp(codec);
                snd_hda_codec_resume_cache(codec);
        }
 -      snd_hda_jack_report_sync(codec);
 +
 +      if (codec->jackpoll_interval)
 +              hda_jackpoll_work(&codec->jackpoll_work.work);
 +      else {
 +              snd_hda_jack_set_dirty_all(codec);
 +              snd_hda_jack_report_sync(codec);
 +      }
+ 
+       codec->in_pm = 0;
        snd_hda_power_down(codec); /* flag down before returning */
  }
  #endif /* CONFIG_PM */

diff --cc sound/pci/hda/hda_codec.h
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge