Merge tag 'sound-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jun 2017 17:30:26 +0000 (10:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jun 2017 17:30:26 +0000 (10:30 -0700)
Pull sound fixes from Takashi Iwai:
 "Two last-minute HD-audio fixes"

* tag 'sound-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix endless loop of codec configure
  ALSA: hda - set input_path bitmap to zero after moving it to new place


Trivial merge