Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 16 Apr 2010 08:03:36 +0000 (10:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 16 Apr 2010 08:03:36 +0000 (10:03 +0200)
commitd336905e00f208bcb89c719022c11dd3d976597a
tree6a5e3cf552231abe24df3cfae8f5d3884c7a1b4f
parent0d0fb0f9c5fddef4a10242fe3337f00f528a3099
parent8392609969b3b37a4da5cff08161661f7a8c16af
Merge branch 'fix/asoc' into for-linus
sound/soc/codecs/wm2000.c
sound/soc/imx/imx-pcm-dma-mx2.c
sound/soc/imx/imx-pcm-fiq.c
sound/soc/imx/imx-ssi.c