Merge branch 'for-linus' into for-next
commit998052b74574699bdd1e451b6556e4d7667a7a4e
authorTakashi Iwai <tiwai@suse.de>
Thu, 11 Sep 2014 11:43:16 +0000 (11 13:43 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 11 Sep 2014 11:43:49 +0000 (11 13:43 +0200)
tree3124898e873cdec28f724106e60d1bff760505f1
parente7e69265b6269763799a5de9c263fbbce32cd3a3
parent7a9744cb455e6faa287e148394b4b422a6f3c5c4
Merge branch 'for-linus' into for-next

Merging for-linus branch for syncing the latest STAC/IDT codec
changes to be affected by the upcoming hda-jack rewrites.
sound/core/pcm_misc.c
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c