Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm...
authorDan Murphy <DMurphy@ti.com>
Thu, 9 Oct 2014 14:57:09 +0000 (09:57 -0500)
committerDan Murphy <DMurphy@ti.com>
Thu, 9 Oct 2014 14:57:09 +0000 (09:57 -0500)
commitbbaf7839deffd06bd1e6c34df55b6c21c37e602d
tree9932b0223becc8d77f4c5e527d57958352125102
parentbbe41f8dc4a7474fd7f7f5c5b8bcfc8d30ebdd9b
parent47f9e608d62ccb228afb934e0d7ffe1fe996b1ca
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: OMAP2: sleep43xx: Access registers to avoid TLB miss
  ARM: OMAP2+: sleep43xx: Add omap_bus_sync style accesses

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