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: (36 commits)
ARM: dts: am43xx: Add scale data fw to wkup_m3 node
ARM: dts: am33xx: Add scale data fw to wkup_m3 node
ARM: OMAP2: pm33xx: Provide i2c voltage scaling data to wkup_m3
remoteproc: wkup_m3_rproc: Add device to rproc_ready callback
remoteproc: wkup_m3_rproc: Introduce wkup_m3_copy_aux_data
ARM: AM43xx: PM: disable DCOLDO DPLL PER force active to allow suspend
ARM: AM43XX: PM: change RTC_SCRATCH1 register handling for rtc-only mode
ARM: OMAP2+: opp33xx: Change OPP50 initialization
ARM: OMAP2: sleep43xx: Set MPU Clockdomain to HW_AUTO after suspend
rtc: OMAP: Add external 32k clock feature
ARM: dts" AM437x: Correct and reorder the rtc compatibility strings
ARM: AM33XX/AM43XX: re-order suspend-params
ARM: AM43XX: Add RTC-only suspend
remoteproc: wkup_m3: Add rtc_only support
ARM: dts: AM437X: Enable RTC
ARM: OMAP2: Add functions to save and restore clock/dpll context en-masse.
ARM: dts: am437x-gp-evm: force enable dcdc3 regulator during suspend
regulator: tps65218: Enable suspend configuration
regulator: of: add support for enabling regulator during suspend
regulator: tps65217: Enable suspend configuration
...
Conflicts:
arch/arm/boot/dts/am437x-sk-evm.dts
arch/arm/boot/dts/am43x-epos-evm.dts
Signed-off-by: Dan Murphy <DMurphy@ti.com>