Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm...
authorDan Murphy <DMurphy@ti.com>
Tue, 12 Aug 2014 15:33:20 +0000 (10:33 -0500)
committerDan Murphy <DMurphy@ti.com>
Tue, 12 Aug 2014 15:33:20 +0000 (10:33 -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: dts: am57xx-beagle-x15: Map regulators to voltage domains

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

Trivial merge