Merge branch 'for-linus' into for-next

Resolved the merge conflict in HD-audio Tegra driver.

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

diff --cc include/sound/hdaudio.h
Simple merge

diff --cc sound/pci/hda/hda_tegra.c
index 567c9eb,e519158..773992a
--- 1/sound/pci/hda/hda_tegra.c
--- 2/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@@ -394,7 -397,8 +394,8 @@@ static int hda_tegra_create(struct snd_
        if (err < 0)
                return err;
  
 -      chip->bus.needs_damn_long_delay = 1;
 +      chip->bus.core.needs_damn_long_delay = 1;
+       chip->bus.core.aligned_mmio = 1;
  
        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
        if (err < 0) {

diff --cc sound/usb/pcm.c
Simple merge