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

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: OMAP5: dts: Fix the bypass clock source for dpll_iva and others
  ARM: OMAP5: Clock: Fix dpll rate calculation in bypass mode
  ARM: DRA7x: dts: Fix the bypass clock source for dpll_iva and others
  ARM: DRA7x: Clock: Fix dpll rate calculation in bypass mode
  ARM: OMAP2+: hwmod: Use spin_lock_irqsave_nested() for locking
  ARM: dts: am57xx-evm: Introduce initial support

Conflicts:
	arch/arm/boot/dts/Makefile

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

diff --cc arch/arm/boot/dts/Makefile
index bff60248723b69886e065e35772efcc955b024b0,ae4a4f0fb32f501d5842c8032c11541f5c355033..d63e325c9fa1edb201cab227e71dc5f1989fca77
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -235,17 -235,12 +235,19 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        am3517-evm.dtb \
        am3517_mt_ventoux.dtb \
        am43x-epos-evm.dtb \
 +      am43x-epos-evm-hdmi.dtb \
        am437x-gp-evm.dtb \
 +      am437x-gp-evm-hdmi.dtb \
        am437x-sk-evm.dtb \
        dra7-evm.dtb \
 +      dra7-evm-lcd7.dtb \
 +      dra7-evm-lcd10.dtb \
        dra72-evm.dtb \
-       am57xx-beagle-x15.dtb
 +      dra72-evm-lcd7.dtb \
 +      dra72-evm-lcd10.dtb \
+       am57xx-beagle-x15.dtb \
+       am57xx-evm.dtb
++
  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \

diff --cc arch/arm/boot/dts/dra7xx-clocks.dtsi
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge