diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-12 20:49:20 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-12 20:49:20 +0200 |
commit | ff096eae2ef7d5f1c62a340a4b670912c2df5b98 (patch) | |
tree | 2dcf70e9536ca73c564c92a35e122e29e15bf5c6 /drivers/hid/hid-tivo.c | |
parent | Merge remote-tracking branches 'asoc/topic/rt5641', 'asoc/topic/rt5677' and '... (diff) | |
parent | ASoC: tegra_wm9712: Use card DAPM context to access widgets (diff) | |
parent | ASoC: tlv320aic23: remove incorrect __exit markups (diff) | |
parent | ASoC: mop500_ab8500: Use card DAPM context to access widgets (diff) | |
download | linux-ff096eae2ef7d5f1c62a340a4b670912c2df5b98.tar.xz linux-ff096eae2ef7d5f1c62a340a4b670912c2df5b98.zip |
Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23' and 'asoc/topic/ux500' into asoc-next