summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-09-10 12:21:03 +0100
committerMark Brown <broonie@kernel.org>2014-09-10 12:21:03 +0100
commit5e3905f62b2eb25d4421117e62f9d0434c0b6563 (patch)
tree73fa4f96ead795f73a9729d6cf3f7cb9953ee189 /sound
parent2eb1dc3179e1ac6eb5b1a5b1fa11d2a256897a20 (diff)
parentfe0a29e163a5d045c73faab682a8dac71c2f8012 (diff)
parentb8a3ee820f7b0802c9b90a9f3426dbda54e93d09 (diff)
parent133c2681c4a0c1b589d138c2fdd0f131bdce20ed (diff)
parent03be88ee4ab3acceddca43f11f4d01bcd6edcb93 (diff)
Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/max98090', 'asoc/fix/samsung' and 'asoc/fix/tlv320aic31xx' into asoc-linus