diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-30 16:55:41 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-30 16:55:41 +0200 |
commit | d781c23e9b46f33c1c6c07febae36f37a11f9d4d (patch) | |
tree | 77361cc997cb7fc6f199ed0b20a4ee2b7da0659f /drivers/char/tpm/tpm_crb.c | |
parent | Merge remote-tracking branches 'asoc/topic/mediatek', 'asoc/topic/mtk', 'asoc... (diff) | |
parent | ASoC: Constify dev_pm_ops variables (diff) | |
parent | ASoC: pxa: Convert to devm_snd_soc_register_platform (diff) | |
parent | ASoC: qcom: Constify asoc_qcom_lpass_cpu_dai_ops (diff) | |
download | linux-d781c23e9b46f33c1c6c07febae36f37a11f9d4d.tar.xz linux-d781c23e9b46f33c1c6c07febae36f37a11f9d4d.zip |
Merge remote-tracking branches 'asoc/topic/pm-ops', 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next