leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e3a66aa33a
linux/sound/soc/fsl
History
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform 
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07: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: use proper defines for stream directions in pcm engines 2012-01-20 13:58:25 +00: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: add MX31_AUDMUX_PORT7_SSI_PINS_7 define 2012-07-18 22:09:40 +01: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 ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
imx-pcm-fiq.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02: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 ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
imx-ssi.h ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
Kconfig Sound updates for 3.5-rc1 2012-05-23 13:05:43 -07:00
Makefile ASoC: add imx-mc13783 sound support 2012-05-18 16:42:21 +01:00
mpc5200_dma.c ASoC: fix trivial build error in mpc5200_dma.c 2012-02-27 14:56:30 +00:00
mpc5200_dma.h Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
mpc5200_psc_ac97.c ASoC: Convert fsl directory to module_platform_driver 2011-11-28 17:23:21 +00: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: Convert fsl directory to module_platform_driver 2011-11-28 17:23:21 +00:00
mpc8610_hpcd.c Linux 3.4-rc2 2012-04-09 11:53:45 +01:00
mx27vis-aic32x4.c ASoC: imx: merge sound/soc/imx into sound/soc/fsl 2012-04-01 11:28:26 +01:00
p1022_ds.c Linux 3.4-rc2 2012-04-09 11:53:45 +01:00
pcm030-audio-fabric.c ASoC: fsl: Add .owner to struct snd_soc_card 2011-12-22 17:34:32 +00: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