Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm...

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: AMx3xx: control: fix compile flags for amx3xx context save/restore
  ARM: dts: OMAP5+: separate the cpu thermal zone definition from omap4
  ARM: AMx3xx: PM: disable rtc-only mode on devices without RTC module

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