Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 15 Sep 2014 22:05:33 +0000 (15:05 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 15 Sep 2014 22:05:33 +0000 (15:05 -0700)
commit8dbc8950672f1d16aefc38c309f34f0d2139f1c0
tree46ecf5c67c56cf12fec787c99d33826f18c8a603
parent9e82bf014195d6f0054982c463575cdce24292be
parentb794dbcd31c8b19118b7d02a39453576aa8e78fb
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus