Merge remote-tracking branch 'asoc/fix/tpa6130a2' into asoc-linus
authorMark Brown <broonie@kernel.org>
Thu, 29 Sep 2016 19:43:55 +0000 (12:43 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 29 Sep 2016 19:43:55 +0000 (12:43 -0700)
commite4cf86a35ca1bc7c2de3ebb34bb5e8aa79c5bca9
tree79e5ede0b90bed8e16ab3475034d6b7c8c54806c
parentb669010e5878dfda9c1b494f96fc122b67f8d880
parenta114580f8f3e5bdefc14d75d6c3ba7032210b980
Merge remote-tracking branch 'asoc/fix/tpa6130a2' into asoc-linus