Merge tag 'v3.15-rc4' into asoc-fsl-spdif
authorMark Brown <broonie@linaro.org>
Mon, 5 May 2014 19:27:30 +0000 (12:27 -0700)
committerMark Brown <broonie@linaro.org>
Mon, 5 May 2014 19:27:30 +0000 (12:27 -0700)
Linux 3.15-rc4


Trivial merge