summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-26 11:16:06 +0900
committerMark Brown <broonie@kernel.org>2015-10-26 11:16:06 +0900
commit8707344edd833738bfdde8ed21bd1a0fd5418015 (patch)
tree090a897a71ec54ddfaa9b2a880bf9f50a5561f89 /sound
parentf72362e6b7522040c16a224d5dcf2022e5468803 (diff)
parent43ac946922b337507c4131c45bf339ddcd7e7402 (diff)
parent6abca1d71b62090821240ee2a4507c94ddd144e9 (diff)
downloadlinux-8707344edd833738bfdde8ed21bd1a0fd5418015.tar.gz
Merge remote-tracking branches 'asoc/topic/imx' and 'asoc/topic/intel' into asoc-next