Merge branch 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux...
authorMark Brown <broonie@kernel.org>
Thu, 19 Oct 2017 18:45:49 +0000 (19:45 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 19 Oct 2017 18:45:49 +0000 (19:45 +0100)

Trivial merge