Merge remote-tracking branches 'asoc/fix/nau8825', 'asoc/fix/ops', 'asoc/fix/rcar...
authorMark Brown <broonie@kernel.org>
Wed, 25 Nov 2015 17:57:51 +0000 (17:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 25 Nov 2015 17:57:51 +0000 (17:57 +0000)

Trivial merge