| author | Texas Instruments Auto Merger <lcpd_integration@list.ti.com> | |
| Mon, 27 Apr 2015 09:21:09 +0000 (04:21 -0500) | ||
| committer | Texas Instruments Auto Merger <lcpd_integration@list.ti.com> | |
| Mon, 27 Apr 2015 09:21:09 +0000 (04:21 -0500) | ||
| commit | ba552b4bc706e4c7040afcd4bc9462fb957768e1 | |
| tree | 7d95ec391d31a267e91a6479b57c0cb7412fbab9 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 1bc045ab6622f65406e48be7e361846ca091b311 | commit | diff |
| parent | 5b2b9f2a7c43a610dbb162542c5b7bf0ee3cd5e7 | commit | diff |
Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree into ti-linux-3.14.y
TI-Feature: power_management_base
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-ti-linux-3.14.y
* 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
ARM: OMAP2+: prm44xx: Add context save and restore for am43xx
ARM: OMAP2+: prm33xx: Fixup up pwrdm context restore
ARM: OMAP2+: cminst44xx: Add context save/restore to am437x clkdms
Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>
TI-Feature: power_management_base
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-ti-linux-3.14.y
* 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
ARM: OMAP2+: prm44xx: Add context save and restore for am43xx
ARM: OMAP2+: prm33xx: Fixup up pwrdm context restore
ARM: OMAP2+: cminst44xx: Add context save/restore to am437x clkdms
Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>