Merge branch 'mxc-audio' into for-2.6.34
Conflicts: arch/arm/plat-mxc/Makefile (dual add) sound/soc/imx/mx27vis_wm8974.c (API updates & removal)
Showing
arch/arm/plat-mxc/ssi-fiq.S
0 → 100644
sound/soc/imx/imx-pcm-fiq.c
0 → 100644
sound/soc/imx/imx-ssi.c
0 → 100644
This diff is collapsed.
sound/soc/imx/imx-ssi.h
0 → 100644
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment