Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 'asoc/fix/pm...
authorMark Brown <broonie@kernel.org>
Wed, 29 Apr 2015 12:37:28 +0000 (13:37 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 29 Apr 2015 12:37:28 +0000 (13:37 +0100)

Trivial merge