| author | Dan Murphy <DMurphy@ti.com> | |
| Tue, 12 Aug 2014 15:33:20 +0000 (10:33 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Tue, 12 Aug 2014 15:33:20 +0000 (10:33 -0500) | ||
| commit | 04dd103fd8280cba2c0c458673275c62b3b142fd | |
| tree | bf7e51416969953cba33f0251f367089322188d9 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 8f69b4c2243fb3b0d85fd2a0b575d5170d53dbea | commit | diff |
| parent | 89b5138e6e8ede97a4e6683640a377461aa3ee81 | commit | diff |
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: dts: am57xx-beagle-x15: Map regulators to voltage domains
Signed-off-by: Dan Murphy <DMurphy@ti.com>
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>