diff options
author | Mark Brown <broonie@kernel.org> | 2016-07-24 22:07:48 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-07-24 22:07:48 +0100 |
commit | e7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5 (patch) | |
tree | 62d92076c83cac9cd45d49f8ccd4a9a4784fa23a /sound/soc/samsung/s3c24xx_uda134x.c | |
parent | 1a946005b348fe4fbea9edfd02bc27b33752c08d (diff) | |
parent | eb87f9e2b3212c84498c6972b529e207e4e95e6a (diff) | |
parent | b82d67f4cf320b7ebe97799ffb0aa85e0172ab40 (diff) | |
download | linux-e7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5.tar.bz2 |
Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next