diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-05 01:07:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-05 01:07:23 +0000 |
| commit | 256fca9247c4e62408923a0fe861398510cf6bc1 (patch) | |
| tree | 133431f188c694f0d0bf88d4277924d0d39c5fbf /sound/soc/generic/simple-card.c | |
| parent | 4a7e0415703977dc61b410f3124ab59d56273f6a (diff) | |
| parent | 77c71765ef78f87dd901fcb4c751908e835a3b2e (diff) | |
| parent | 92b2ad2c9e18ca2bfa8727af7edcd372d9acaac4 (diff) | |
| parent | 6742e15cf92a8dc3065843a627952ed518e08267 (diff) | |
| parent | e2cef68d5903cc2052e9f6e46b323b7ead695e73 (diff) | |
Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/max98357a', 'asoc/topic/omap' and 'asoc/topic/rt286' into asoc-next