Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Nov 2010 21:16:52 +0000 (21:16 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Nov 2010 21:16:52 +0000 (21:16 +0000)
commitfdc1f5d0608faa9bb06c1e7c662831550b32d2d3
tree322b20dad4c7e7d3aa95484a78523651b0721c7e
parent77c667d1365e19c2848d37bf408e2f0b086b63d9
parent25436180ee8bed6740f29d92c2030c759885c147
Merge branch 'for-2.6.37' into for-2.6.38
sound/soc/codecs/tlv320aic3x.c
sound/soc/omap/osk5912.c