Merge branch 'fix/davinci' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Fri, 31 Jan 2014 16:38:20 +0000 (16:38 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 31 Jan 2014 16:38:20 +0000 (16:38 +0000)
commit61d384aed4e8fbfafe3909a706935a03223c1254
tree3d01cf97b1d9057dbdf6d11105ca7d17cfca0079
parentab8b14b6d841b314434f5817c107572f923fc43d
parentfb6d208d54de2791d6d361ef258ea7d5d3427d01
Merge branch 'fix/davinci' of git://git./linux/kernel/git/broonie/sound into HEAD
sound/soc/davinci/davinci-evm.c
sound/soc/davinci/davinci-mcasp.c