renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
Code
f76fe059dd
linux-next/sound/soc/fsl
History
Mark Brown ddfb43f388 Linux 3.6-rc6 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJQVkutAAoJEHm+PkMAQRiGW8sH/36FVQ3zI75QH16AmR++2nMZ
 BRJGoxcRFMssrXTYVdkMyzygf8b7MZbNEn1qt2g63MNzGaJucPlw5NVL4GLzR+zr
 x/EglLrTEPCD5el9wJ3ls9iC1soudKQTvC2BjcdUjpoSwHrDM/7GKfbOacE54Wqc
 C1VHCcg5DWOD7F0RnYT2SQEVCeDODNmcyFdk7Oi4cUicTPJoYWJ9O9MGfBDBok0N
 M+dXxa9nvsl7EeEKpBKH9vo4TfXn3Gsj6LCRdedvI15ilZjfo8jdHYbSn7KBfQuZ
 JIKRnqkaQ1JfMFt+M/JJZ1b/+Wrd4HLMmmn5oUmrGGIvhpi32nJfi/97+nSy8iU=
 =c5gW
 -----END PGP SIGNATURE-----

Merge tag 'v3.6-rc6' into for-3.7

Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
	sound/soc/omap/am3517evm.c
2012-09-22 11:26:27 -04:00
..
efika-audio-fabric.c ASoC: fsl: Add .owner to struct snd_soc_card 2011-12-22 17:34:32 +00:00
eukrea-tlv320.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
fsl_dma.c ASoC: fsl: remove unnecessary call to dma_unmap_single 2012-09-18 22:32:44 -04:00
fsl_dma.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl_ssi.c Revert "ASoC: fsl_ssi: convert to use devm_clk_get" 2012-06-05 11:08:45 +01:00
fsl_ssi.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl_utils.c ASoC: fsl: remove helper fsl_asoc_get_codec_dev_name 2012-04-01 11:28:27 +01:00
fsl_utils.h ASoC: fsl: remove helper fsl_asoc_get_codec_dev_name 2012-04-01 11:28:27 +01:00
imx-audmux.c ASoC: imx-audmux: remove null check of audmux_base in audmux_read_file 2012-09-18 22:53:15 -04:00
imx-audmux.h ASoC imx-audmux: add MX31_AUDMUX_PORT7_SSI_PINS_7 define 2012-07-18 22:09:40 +01:00
imx-mc13783.c ASoC: imx-mc13783: Add audmux settings for mx27pdk 2012-07-05 13:48:25 +01:00
imx-pcm-dma.c ASoC: imx-pcm-dma: open function failed when snd_dmaengine_pcm_open fail 2012-09-18 22:52:43 -04:00
imx-pcm-fiq.c ARM: imx: enable SPARSE_IRQ for imx platform 2012-07-01 21:59:20 +08:00
imx-pcm.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
imx-pcm.h ASoC: fsl: assign dma peripheral type according to bus topology 2012-04-01 11:28:29 +01:00
imx-sgtl5000.c ASoC: imx-sgtl5000: fix error return code 2012-08-20 20:44:19 +01:00
imx-ssi.c ASoC: Revert 'ASoC: imx-ssi: Remove mono support' 2012-09-06 08:44:21 +08:00
imx-ssi.h ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
Kconfig ASoC: fsl: add PPC_MPC52xx dependency to SND_POWERPC_SOC 2012-09-22 11:01:15 -04:00
Makefile ASoC: add imx-mc13783 sound support 2012-05-18 16:42:21 +01:00
mpc5200_dma.c ASoC: fsl: mpc5200 combine psc_dma platform data 2012-09-18 23:03:42 -04:00
mpc5200_dma.h ASoC: fsl: mpc5200 combine psc_dma platform data 2012-09-18 23:03:42 -04:00
mpc5200_psc_ac97.c ASoC: fsl: mpc5200 add missing information to snd_soc_dai_driver 2012-09-18 23:04:08 -04:00
mpc5200_psc_ac97.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
mpc5200_psc_i2s.c ASoC: fsl: mpc5200 add missing information to snd_soc_dai_driver 2012-09-18 23:04:08 -04:00
mpc8610_hpcd.c ASoC: fsl: use snd_soc_register_card to register the card 2012-09-18 22:32:44 -04:00
mx27vis-aic32x4.c ASoC: mx27vis: retrieve gpio numbers from platform_data 2012-09-17 07:35:08 -04:00
p1022_ds.c ASoC: fsl: use snd_soc_register_card to register the card 2012-09-18 22:32:44 -04:00
pcm030-audio-fabric.c ASoC: fsl: register the wm9712-codec 2012-09-22 11:02:17 -04:00
phycore-ac97.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
wm1133-ev1.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00