Merge remote-tracking branch 'asoc/fix/max98090' into asoc-linus
authorMark Brown <[email protected]>
Wed, 21 May 2014 23:23:37 +0000 (00:23 +0100)
committerMark Brown <[email protected]>
Wed, 21 May 2014 23:23:37 +0000 (00:23 +0100)

Trivial merge