Merge branch 'for-2.6.34' into for-2.6.35
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 29 Mar 2010 20:03:20 +0000 (21:03 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 29 Mar 2010 20:03:20 +0000 (21:03 +0100)
commit2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d
tree72200e6f6f5877b35dab173ef47a463f98223dbb
parent9dd7b79a86c53a097463ee1582c0bc6c4b83b770
parentfb48e3c6a4d8888aff61fbf567aadac7d206e973
Merge branch 'for-2.6.34' into for-2.6.35
sound/soc/codecs/wm8994.c
sound/soc/soc-core.c