aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-06 12:39:07 +0100
committerMark Brown <broonie@kernel.org>2015-08-06 12:39:07 +0100
commitd00a9e02178401433fc386e69c936f2039f07b57 (patch)
tree9bb242fd8c3c9f361efa5f046c35328a31c95c13
parent78be55af0d6092dd7ec19c0c7b2f381383af1a95 (diff)
parentbffc4496886683fac86d31e5d0cf9a22f8044e3d (diff)
parent45f503df1ba445359b94e1758c5e4f2c3460c8e4 (diff)
parentc7bcf8777a539e64dafc7417c00047aee6eb8909 (diff)
downloadlinux-stericsson-d00a9e02178401433fc386e69c936f2039f07b57.tar.gz
Merge remote-tracking branches 'asoc/fix/cs4265', 'asoc/fix/intel' and 'asoc/fix/topology' into asoc-linus