Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <DMurphy@ti.com>
Thu, 4 Dec 2014 07:32:00 +0000 (01:32 -0600)
committerDan Murphy <DMurphy@ti.com>
Thu, 4 Dec 2014 07:32:00 +0000 (01:32 -0600)
commite2d2d86cb159cece4c074598951c1ac9e169daa2
treea76cadffae5512782f9f41acf7de8ba0cafbe185
parent284a9b5c9247890d23a5b61c8f257f52045578a5
parentfd2ebc53eeb6565543d44b105d91cbd5a1b8cafd
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.14.y

TI-Feature: platform_base
TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
TI-Branch: platform-ti-linux-3.14.y

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: dts: dra7-evm: Update SMPS7 (VDD_CORE) max voltage to match DM
  ARM: dts: dra7-evm: Fix typo in SMPS6 (VDD_GPU) max voltage

Signed-off-by: Dan Murphy <DMurphy@ti.com>
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra72-evm.dts