diff options
author | Mark Brown <broonie@kernel.org> | 2017-11-10 21:31:07 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-11-10 21:31:07 +0000 |
commit | f2470d52913883e0c34e4121a498087493198b4c (patch) | |
tree | 67296fc6a34436401413e577338ab90f2c933fc5 /sound/pci/bt87x.c | |
parent | 242f66c84533af20a20ecff4ea1b2c8c6a0f65ed (diff) | |
parent | abd4f0e1c24fd5b7241c77506006e9c0982128c0 (diff) | |
parent | 8adc430603d67e76a0f8491df21654f691acda62 (diff) | |
parent | 574ff444b9fcc2554e381054f5052cb9c0e91de7 (diff) | |
download | linux-f2470d52913883e0c34e4121a498087493198b4c.tar.bz2 |
Merge remote-tracking branches 'asoc/topic/bcm2835', 'asoc/topic/cs42l56' and 'asoc/topic/cs43130' into asoc-next