Merge tag 'v3.11-rc5' into asoc-dapm
authorMark Brown <broonie@linaro.org>
Tue, 13 Aug 2013 09:19:23 +0000 (10:19 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 13 Aug 2013 09:19:23 +0000 (10:19 +0100)
Linux 3.11-rc5


Trivial merge