summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-27 19:04:43 +0000
committerMark Brown <broonie@kernel.org>2014-11-27 19:04:43 +0000
commit6c0b2d151648c31f26b52a826cdc53e989e3522a (patch)
treefff91b594effb1cb0e2748a8cda6fd465b0055f0 /sound
parentb5ce244532c73b62db0201e0df0dba3ee34243fe (diff)
parent00d647b081b5ef2193fd15910fbd103f483a5d15 (diff)
parent69b93607a9862b1db2f0f2e078e1396f8e20fa9b (diff)
parent68d27bc63c4f331c912dfb92168f5fe4753c61c9 (diff)
parent0b5155bbca8b5a8a1456ae462a47eeaedf8ce091 (diff)
parent24445f8c5eae926e402335bbe0292f09b1deb7a7 (diff)
Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/lm49453', 'asoc/topic/max98088' and 'asoc/topic/max98090' into asoc-next