diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-31 08:45:47 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-31 08:45:47 +0400 |
| commit | fe61f9fd52079143c2cecc5a164dc6cfbe6b0223 (patch) | |
| tree | 4beab9fad797001460650efd3cacdf55d2a95d29 /net/sched/cls_flow.c | |
| parent | fe388fac0f18010688032393d042807261791eaf (diff) | |
| parent | 7c5688e7fd722690e636c64630ad56babb589e96 (diff) | |
| download | linux-fe61f9fd52079143c2cecc5a164dc6cfbe6b0223.tar.xz | |
Merge tag 'exynos-mcpm-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
Merge "Exynos 2nd MCPM updates for v3.16" from Kukjin Kim:
- enable mcpm for dual-cluster exynos5800
- since commit 166aaf39 ("ARM: 8029/1: mcpm: Rename the
power_down_finish() functions to be less confusing"),
use new member name wait_for_cpu_powerdown.
This is based on tags/exynos-mcpm.
Note that since the commit 166aaf39 is in rmk tree so this
should be sent to upstream after that in 3.16 merge window.
* tag 'exynos-mcpm-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: mcpm rename the power_down_finish
ARM: EXYNOS: Enable mcpm for dual-cluster exynos5800 SoC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/sched/cls_flow.c')
0 files changed, 0 insertions, 0 deletions