Merge tag 'v3.18-rc2' into asoc-sgtl5000
authorMark Brown <broonie@kernel.org>
Mon, 27 Oct 2014 11:18:55 +0000 (11:18 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 27 Oct 2014 11:18:55 +0000 (11:18 +0000)
Linux 3.18-rc2


Trivial merge