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:
  HACK: ARM: DRA7: clockdomain: Fix DCAN1 RAMINT and module OFF
  pinctrl: dra: dt-bindings: Fix output pull up/down

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

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

diff --cc include/dt-bindings/pinctrl/dra.h
Simple merge