diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2019-09-03 07:55:22 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2019-09-03 07:55:22 +0530 |
| commit | f75d2accca7785657311653c125bb22f342dc5d9 (patch) | |
| tree | 0236aefbc787650a9061871a8f41038995b5fdbd /MAINTAINERS | |
| parent | 9176b425bf8ff98fd12bffeea8e39373345cd745 (diff) | |
| parent | 248b5f297cf809b6a61e38db22049011f619518b (diff) | |
| download | linux-stable-f75d2accca7785657311653c125bb22f342dc5d9.tar.gz linux-stable-f75d2accca7785657311653c125bb22f342dc5d9.tar.bz2 linux-stable-f75d2accca7785657311653c125bb22f342dc5d9.zip | |
Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d3964379841b..e507f1a7116f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13292,8 +13292,8 @@ QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096 M: Ilia Lin <ilia.lin@kernel.org> L: linux-pm@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/opp/kryo-cpufreq.txt -F: drivers/cpufreq/qcom-cpufreq-kryo.c +F: Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt +F: drivers/cpufreq/qcom-cpufreq-nvmem.c QUALCOMM EMAC GIGABIT ETHERNET DRIVER M: Timur Tabi <timur@kernel.org> |