diff options
author | Mark Brown <broonie@kernel.org> | 2015-10-26 11:15:58 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-10-26 11:15:58 +0900 |
commit | 2c218b7434205d2151118bd66832d73fb85e36ae (patch) | |
tree | 5ed8f9fbbe994cc6fe1f9dd93384729179b9c4fc /sound/soc/codecs/Makefile | |
parent | 4cb803b8edf575641a372ba0ca433cd48deb3af2 (diff) | |
parent | 92b822a499607c32ce12ffd798a095babedc3202 (diff) | |
parent | 6ebbce0a6e15fd52ef029f780ec5fb3282fc22e3 (diff) | |
download | op-kernel-dev-2c218b7434205d2151118bd66832d73fb85e36ae.zip op-kernel-dev-2c218b7434205d2151118bd66832d73fb85e36ae.tar.gz |
Merge remote-tracking branches 'asoc/topic/ad193x' and 'asoc/topic/arizona' into asoc-next