diff options
author | Mark Brown <broonie@kernel.org> | 2015-07-15 12:50:33 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-07-15 12:50:33 +0100 |
commit | a5e412a99c07382bda3643f9532d2769141efc7d (patch) | |
tree | 450dbcf3c176ca9216371a3998a0a71dd9d6d18d /sound/soc/codecs/rt5631.c | |
parent | 6adcafae6ed20fe380addc8e7c628e529751ade3 (diff) | |
parent | c4a99a4b4f6ef56e9c8182920680b84a7129ca80 (diff) | |
parent | 5e4cb7b60833b0124a9f71dbc5118144ca79c3c4 (diff) | |
download | linux-a5e412a99c07382bda3643f9532d2769141efc7d.tar.gz linux-a5e412a99c07382bda3643f9532d2769141efc7d.tar.bz2 linux-a5e412a99c07382bda3643f9532d2769141efc7d.zip |
Merge branches 'topic/rt298', 'topic/ts3a227e' and 'topic/cs42xx8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-owner