From: Mark Brown <broonie@linaro.org>
Date: Tue, 8 Apr 2014 20:22:10 +0000 (+0100)
Subject: Merge tag 'asoc-v3.15-4' into asoc-linus
X-Git-Tag: v3.15-rc1~36^2~1^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=30659894f379452d3ebaa00d44b118f1237fbcaf;p=~emulex%2Finfiniband.git

Merge tag 'asoc-v3.15-4' into asoc-linus

ASoC: Final updates for v3.15 merge window

A few more updates from last week - use of the tdm_slot mapping from
Xiubo plus a few smaller fixes and cleanups.

# gpg: Signature made Mon 31 Mar 2014 10:49:42 BST using RSA key ID 7EA229BD
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
---

30659894f379452d3ebaa00d44b118f1237fbcaf