summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-09-23 11:01:03 -0700
committerMark Brown <broonie@kernel.org>2015-09-23 11:01:03 -0700
commit312e0bce7f2d7fcf57f38f6e229a82eb4e0c2af4 (patch)
tree4406f0499be59a5eeb8f08ede1f492fa763776fe
parentfcffa0dbb6c9144d07011531860da2f1e8a8b7cd (diff)
parentab1fffe3a73c694d698645451ba61255ec4ba5e6 (diff)
parentd76f41982f2fc88492efd96c7c3178044f32e125 (diff)
parent6bd3c6f75e0f9baddbf1196a7e3fceabb50c7e3c (diff)
parent5b64c173cdea21105eb4794487b3d593f0a2e6c3 (diff)
parentf1ec5ec7a94ba8138f9cbdc1e9e3b03aee29c4df (diff)
parentf0e03dbd2d61d991bdd2d76b4e84681fe3077176 (diff)
downloadlinux-312e0bce7f2d7fcf57f38f6e229a82eb4e0c2af4.tar.bz2
Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/doc', 'asoc/fix/fsl-card', 'asoc/fix/fsl-ssi', 'asoc/fix/intel' and 'asoc/fix/maintainers' into asoc-linus