Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm...
authorDan Murphy <DMurphy@ti.com>
Thu, 18 Sep 2014 17:57:40 +0000 (12:57 -0500)
committerDan Murphy <DMurphy@ti.com>
Thu, 18 Sep 2014 17:57:40 +0000 (12:57 -0500)
commit1ef37cd35d8dad6ead4074287187397b411d24e5
treec7bf03e427f85f12e8822b921db344a65ae349e2
parent6195b6742e0e4130747b043247125229deb76b1a
parent1398dc3b138fe09faf1cd46f36e82c1e3d4de81f
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: AM43xx: PM: save and restore some misc PRM registers during rtc-only
  HACK: ARM: DRA7: PM: Disable CPUIDLE
  ARM: OMAP2: pm33xx: Bump firmware version requirement to 0x189
  ARM: OMAP2: pm33xx: Fix race condition between cpuidle and suspend
  cpufreq: cpufreq-cpu0: Use cpufreq_generic_suspend()
  remoteproc: wkup_m3_rproc: Move aux_data region
  ARM: OMAP2: sleep43xx: Use correct address for MPU Clockdomain
  ARM: AM43XX: PRM: Add IO Wake up support
  ARM: OMAP4: PRM: Remove hardcoding of PRM_IO_PMCTRL_OFFSET register
  ARM: OMAP4: PRM: Add nr_irqs check to extend support to single core SOCs.
  ARM: OMAP4+: PRM: fix omap4 version of prm_save_and_clear_irqen
  ARM: OMAP2+: AM43XX: Add PRCM int16 as the wake up source

Conflicts:
arch/arm/boot/dts/dra72x.dtsi
arch/arm/boot/dts/dra74x.dtsi
arch/arm/mach-omap2/prcm43xx.h

Signed-off-by: Dan Murphy <DMurphy@ti.com>
arch/arm/boot/dts/am4372.dtsi
arch/arm/mach-omap2/prcm43xx.h
drivers/remoteproc/wkup_m3_rproc.c