author | Texas Instruments Auto Merger <lcpd_integration@list.ti.com> | |
Wed, 1 Apr 2015 22:28:46 +0000 (17:28 -0500) | ||
committer | Texas Instruments Auto Merger <lcpd_integration@list.ti.com> | |
Wed, 1 Apr 2015 22:28:46 +0000 (17:28 -0500) | ||
commit | 051f0202732602e0a82d0282319a07848064c712 | |
tree | 78182b670623d0d897fafb6a6c86a9bf031ce27e | tree | snapshot (tar.xz tar.gz zip) |
parent | 914ecb9ac45b0108bdc7a5bbb98e61ee8d558614 | commit | diff |
parent | dd1af75f2773ffb2060aaad51e04d23fce0cddd1 | 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+: cpuidle33xx: Change wkup_m3 idle state to avoid MPU PLL bypass
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+: cpuidle33xx: Change wkup_m3 idle state to avoid MPU PLL bypass
Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>