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)
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>

Trivial merge