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: DRA7: hwmod data: Add missing UART hwmod data
  arm: mach-omap2: omap_hwmod_43xx_data: add hwmod support for tscadc on am437x-evm
  arm: mach-omap2: omap_hwmod_33xx_43xx_ipblock_data: Move am33xx_l4_hs_hwmod to ipblock_data
  ARM: DRA7/AM43XX: fix header definition for omap44xx_restart

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

diff --cc arch/arm/mach-omap2/common.h
Simple merge

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

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