Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm... ti2014.10.01
authorTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Fri, 9 Jan 2015 23:20:49 +0000 (17:20 -0600)
committerTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Fri, 9 Jan 2015 23:20:49 +0000 (17:20 -0600)
commit7828f3b4cb26fa9c978aa96cc46cca8521957f24
tree8306ff5401aaf15d17582c616bc6e9af9fd4e9b8
parent6af3881e0d3701fcec3050d477b62d7f3c9ea42e
parenta6d90baab66926c9ce957bbad6b5bac8572e3fb5
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+: sleep43xx: Do not use CKE override during DeepSleep
  ARM: OMAP2+: sleep43xx: Add missing registers to EMIF save and restore

Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>