Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 17 Nov 2010 18:59:19 +0000 (18:59 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 17 Nov 2010 18:59:19 +0000 (18:59 +0000)
commit3df94756fe9026c6386ebd10501c2df85df3dbee
treef87c3c801f02ab6c4281624933f33b2ee3f32cea
parent84dab5671bff4516781c14f4fba5a1e2be13be1e
parentbedad0ca3fb2ba52c347b54a97b78d32e406dd96
Merge branch 'for-2.6.37' into for-2.6.38
sound/soc/codecs/wm8994.c
sound/soc/davinci/davinci-evm.c