diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-12 20:49:22 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-12 20:49:22 +0200 |
commit | 7667428f80526d908124e0647ac5dbe3dad88900 (patch) | |
tree | 22c88411d231ff65ad24c2affa73c30b044e1330 /fs/nfs/internal.h | |
parent | Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23' a... (diff) | |
parent | ASoC: wm2200: Drop unnecessary dapm bias_level initialization (diff) | |
parent | ASoC: wm5100: match wait_for_completion_timeout return type (diff) | |
parent | ASoC: wm8731: let codec to manage clock by itself (diff) | |
parent | ASoC: wm8804: Enable runtime PM (diff) | |
parent | ASoC: wm8996: ensure lower bounds of 1 for timeout (diff) | |
download | linux-7667428f80526d908124e0647ac5dbe3dad88900.tar.xz linux-7667428f80526d908124e0647ac5dbe3dad88900.zip |
Merge remote-tracking branches 'asoc/topic/wm2200', 'asoc/topic/wm5100', 'asoc/topic/wm8731', 'asoc/topic/wm8804' and 'asoc/topic/wm8996' into asoc-next