Merge branch 'for-linus' into for-next

Conflicts:
	sound/pci/hda/hda_codec.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc sound/pci/cs46xx/cs46xx_lib.c
Simple merge

diff --cc sound/pci/ctxfi/ctatc.c
Simple merge

diff --cc sound/pci/hda/hda_codec.c
index 5e0bdea6c5c8b99a361c3adb92cc7451c181bf50,f560051a949e943e10efb844364d5a978a587fcd..a6c34dc6dac18f6000d120c3bfd2dce41d42fe0b
--- 1/sound/pci/hda/hda_codec.c
--- 2/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@@ -4429,9 -4453,12 +4450,12 @@@ static void __snd_hda_power_up(struct h
        /* If the power down delayed work was cancelled above before starting,
         * then there is no need to go through power up here.
         */
-       if (codec->power_on)
+       if (codec->power_on) {
+               if (codec->power_transition < 0)
+                       codec->power_transition = 0;
 -              spin_unlock(&codec->power_lock);
                return;
+       }
 +
        trace_hda_power_up(codec);
        snd_hda_update_power_acct(codec);
        codec->power_on = 1;

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/hda_proc.c
Simple merge

diff --cc sound/pci/sis7019.c
Simple merge