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

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: dts: DRA7: Add PRM interrupt
  ARM: dts: OMAP3+: Add PRM interrupt
  ARM: OMAP3+: PRM: register interrupt information from DT
  ARM: OMAP4+: PRM: Enable wakeup capability for OMAP5, DRA7
  ARM: OMAP4+: PRM: remove "wkup" event
  ARM: OMAP4+: PRM: register interrupt information from DT
  ARM: OMAP4: PRM: use the generic prm_inst to allow logic to be abstracted
  ARM: OMAP4+: prminst: provide function to find prm_dev instance offset
  ARM: OMAP5: powerdomain data: fix powerdomain powerstate

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

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge