ASoC: Merge tag 'v3.4-rc3' into for-3.5

[linux-beck.git] / sound / soc / fsl / imx-audmux.c

diff --git a/sound/soc/imx/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
similarity index 100%
rename from sound/soc/imx/imx-audmux.c
rename to sound/soc/fsl/imx-audmux.c