Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <[email protected]>
Mon, 15 Sep 2014 22:05:33 +0000 (15:05 -0700)
committerMark Brown <[email protected]>
Mon, 15 Sep 2014 22:05:33 +0000 (15:05 -0700)

Trivial merge