Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 17:40:55 +0000 (18:40 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 17:40:55 +0000 (18:40 +0100)
commit60529c65ec3bc1a347f67eec1b1567efebbf7ce1
treeb0306d615dc7fa791030fd8348706ed66c3c08d8
parent5d99d778495cb02eafd38292f462c4466fc7189f
parent5f6e7d52c4959019d12a7deebbde548884a917d1
Merge branch 'topic/core' of git://git./linux/kernel/git/broonie/sound into asoc-dapm
sound/soc/soc-dapm.c
sound/soc/soc-pcm.c