Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm...
authorDan Murphy <DMurphy@ti.com>
Fri, 31 Oct 2014 18:33:14 +0000 (13:33 -0500)
committerDan Murphy <DMurphy@ti.com>
Fri, 31 Oct 2014 18:33:14 +0000 (13:33 -0500)
commit0a2175ca7d7e8b3160801580e3325ccf3b2abaf1
treecc416f39a4904de86bbd54ffbe4b0591542b478a
parent92051c2c48ef8615a00552a0aa27d2baed49c2b2
parent9a57206cb540de464a24888bdf2ec4cc12a4fe44
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:
  thermal: DRA7: fallback to restarting the system in case poweroff fails
  PM / devfreq: Export helper functions for drivers

Signed-off-by: Dan Murphy <DMurphy@ti.com>