diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-02 02:52:02 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-02 02:52:02 +0200 |
| commit | 824f25c1ccded5de2d3e18268b91cddccdad3868 (patch) | |
| tree | 11122c29a02e59c1b6f4fe6c23c902bc25bf80f3 /arch/arm/include/asm/mcpm.h | |
| parent | Merge tag 'renesas-da9063-da9210-quirk-for-v4.1' of git://git.kernel.org/pub/... (diff) | |
| parent | ARM: rockchip: disable watchdog during suspend (diff) | |
| download | linux-824f25c1ccded5de2d3e18268b91cddccdad3868.tar.xz linux-824f25c1ccded5de2d3e18268b91cddccdad3868.zip | |
Merge tag 'v4.1-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Merge "ARM: rockchip: soc code changes for 4.1" from Heiko Stuebner:
Some suspend improvements reducing resume time and making sure the
watchdog does not reset after 12 hours and a change to constify and
staticize some smp parts.
* tag 'v4.1-rockchip-soc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: rockchip: disable watchdog during suspend
ARM: rockchip: decrease the wait time for resume
ARM: rockchip: Constify struct regmap_config and staticize local function
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/include/asm/mcpm.h')
0 files changed, 0 insertions, 0 deletions