Merge tag 'v4.0-rc7' into asoc-core
authorMark Brown <broonie@kernel.org>
Thu, 9 Apr 2015 10:23:57 +0000 (11:23 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 9 Apr 2015 10:23:57 +0000 (11:23 +0100)
Linux 4.0-rc7


Trivial merge