projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6af3881 a6d90ba)
Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm...
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)
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>

Trivial merge
Domain: System / Uncategorized;