Merge branch 'for-rafael' of...
Merge branch 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq Pull devfreq updates for v4.3 from MyungJoo Ham. * 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq: PM / devfreq: Fix incorrect type issue. PM / devfreq: tegra: Update governor to use devfreq_update_stats() PM / devfreq: comments for get_dev_status usage updated PM / devfreq: drop comment about thermal setting max_freq PM / devfreq: cache the last call to get_dev_status() PM / devfreq: Drop unlikely before IS_ERR(_OR_NULL) PM / devfreq: exynos-ppmu: bit-wise operation bugfix. PM / devfreq: exynos-ppmu: Update documentation to support PPMUv2 PM / devfreq: exynos-ppmu: Add the support of PPMUv2 for Exynos5433 PM / devfreq: event: Remove incorrect property in exynos-ppmu DT binding Conflicts: drivers/devfreq/event/exynos-ppmu.c
Showing
- drivers/devfreq/devfreq.c 6 additions, 6 deletionsdrivers/devfreq/devfreq.c
- drivers/devfreq/event/exynos-ppmu.c 2 additions, 1 deletiondrivers/devfreq/event/exynos-ppmu.c
- drivers/devfreq/governor_simpleondemand.c 18 additions, 15 deletionsdrivers/devfreq/governor_simpleondemand.c
- drivers/devfreq/tegra-devfreq.c 5 additions, 3 deletionsdrivers/devfreq/tegra-devfreq.c
- include/linux/devfreq.h 23 additions, 1 deletioninclude/linux/devfreq.h
Loading
Please register or sign in to comment