Merge tag 'v3.18-rc3' into asoc-sgtl5000
authorMark Brown <broonie@kernel.org>
Mon, 3 Nov 2014 15:13:33 +0000 (15:13 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 3 Nov 2014 15:13:33 +0000 (15:13 +0000)
Linux 3.18-rc3


Trivial merge