diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-12 20:49:03 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-12 20:49:03 +0200 |
commit | 626761ad022c01450330c5774399b35d7fc7a0ac (patch) | |
tree | c4b7251998f4c319fa7a3b8604dfbc8341c9771a | |
parent | Merge remote-tracking branches 'asoc/topic/dmaengine', 'asoc/topic/fsi', 'aso... (diff) | |
parent | ASoC: wm1133-ev1: Use card DAPM context to access widgets (diff) | |
parent | ASoC: jz4740: Add jz4780 support (diff) | |
parent | ASoC: kirkwood: constify of_device_id array (diff) | |
download | linux-626761ad022c01450330c5774399b35d7fc7a0ac.tar.xz linux-626761ad022c01450330c5774399b35d7fc7a0ac.zip |
Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/jz4740' and 'asoc/topic/kirkwood' into asoc-next