Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...

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: Add PMU nodes
  ARM: dts: OMAP5: add pmu node
  ti_config_fragments/baseport.cfg: Fix a comment using unsupported format

Conflicts:
	arch/arm/boot/dts/dra72x.dtsi
	arch/arm/boot/dts/dra74x.dtsi

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