From: Linus Torvalds Date: Thu, 18 Sep 2014 17:45:37 +0000 (-0700) Subject: Merge tag 'sound-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... X-Git-Tag: MMI-PSA29.97-13-9~11521 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=33d31d34769a67609d12753af7e57743b934ca8e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'sound-3.17-rc6' of git://git./linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "All small fixes in random various drivers, mostly for ASoC at this time, which look reasonable for a high rc number" * tag 'sound-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: rockchip-i2s: dt: swap tx and rx channed request number in example ASoC: rockchip-i2s: fix registers' property of rockchip i2s controller ASoC: rockchip-i2s: fix master mode set bit error ASoC: cs4265: Fix register address to set the proper data type. ALSA: hda - Fix invalid pin powermap without jack detection ASoC: soc-pcm: fix dpcm_path_get error handling ASoC: samsung-i2s: Check secondary DAI exists before referencing ASoC: Update email id of the author ASoC: dwc: Update email id of the author ASoC: davinci-mcasp: Correct rx format unit configuration ASoC: tlv320aic31xx: Fix 24bit samples with I2S format and 12MHz mclk --- 33d31d34769a67609d12753af7e57743b934ca8e