diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-01 17:52:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-01 17:52:02 -0700 |
| commit | 824f25c1ccded5de2d3e18268b91cddccdad3868 (patch) | |
| tree | 11122c29a02e59c1b6f4fe6c23c902bc25bf80f3 /arch/arm/common | |
| parent | ffe971ef40ca147ab0443ea12ed4fc552bb28498 (diff) | |
| parent | a0307d186f5015ee3d77e209e5c06190cbf02478 (diff) | |
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/common')
0 files changed, 0 insertions, 0 deletions