Merge tag 'v3.17-rc4' into asoc-simple
authorMark Brown <broonie@kernel.org>
Thu, 2 Oct 2014 15:53:35 +0000 (16:53 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 2 Oct 2014 15:53:35 +0000 (16:53 +0100)
Linux 3.17-rc4


Trivial merge