Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Jun 2011 19:10:28 +0000 (20:10 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Jun 2011 19:10:28 +0000 (20:10 +0100)
commit1ae4e9b99682adfe9ae170ed593f26fe89eb65b5
treea8f367c65d19d54e7e624b99f36720c86bf7f067
parentdf1553c8debddc10c6fa9ebe39f5acf5b13bb190
parent53dea36c70c1857149a8c447224e3936eb8b5339
Merge branch 'for-3.0' into for-3.1
sound/soc/imx/imx-ssi.c
sound/soc/pxa/pxa2xx-pcm.c