diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-29 13:37:28 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-29 13:37:28 +0100 |
commit | a78001b0137e3dd7acb15f6813bf2e5046d2f2ff (patch) | |
tree | a1fd26867234931b8ac9dbce33e62eace4749c30 /include/sound/soc.h | |
parent | 1ce286b9c9bd08875072a7c3c6a43ef2a2ea4a71 (diff) | |
parent | 9d7dd6cd2a1d0d307be6bf783e40e7fda17d6dba (diff) | |
parent | 28ecc0b658e2ac882faa80e7ff1d72d144299bd0 (diff) | |
parent | aae013d646aae8787b76255d1a1cadd7f64a47dd (diff) | |
parent | 96f05be37f4ece1dffba92d4ae079a486a4cf6df (diff) | |
parent | d1acba2fdebb449bad01e7cf77a9f9730dfaca6e (diff) | |
download | op-kernel-dev-a78001b0137e3dd7acb15f6813bf2e5046d2f2ff.zip op-kernel-dev-a78001b0137e3dd7acb15f6813bf2e5046d2f2ff.tar.gz |
Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 'asoc/fix/pm', 'asoc/fix/qcom' and 'asoc/fix/rcar' into asoc-linus