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: 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>