diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 12:49:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 12:49:05 +0100 |
| commit | 248519c00eb239adc9a4a33e9970ccfea335b83a (patch) | |
| tree | a7cf30f3187b4f6cf975ab63f9e9db0a1bfa923e /sound/pci/ctxfi/ctimap.c | |
| parent | 7370780cfd52552e570e4d252c75584c36378e4e (diff) | |
| parent | 872bbb3aa35c2c73dee6ca13aeb5448b38b457ad (diff) | |
| parent | 0d985b1c76623747107dbab1052044d6bac3866d (diff) | |
| parent | 58a9014ae6422325f12d54b5dbb95531009ab70f (diff) | |
| parent | 3b2a0013c7d49783d5ac3df9178e9907cd6ebd73 (diff) | |
| parent | 7c168d5f8bda5716e1a49040b901f26a3002517d (diff) | |
| download | blackbird-op-linux-248519c00eb239adc9a4a33e9970ccfea335b83a.tar.gz blackbird-op-linux-248519c00eb239adc9a4a33e9970ccfea335b83a.zip | |
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/spdif', 'asoc/topic/ssm2602' and 'asoc/topic/ssm4567' into asoc-next
