Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <DMurphy@ti.com>
Thu, 6 Nov 2014 04:33:06 +0000 (22:33 -0600)
committerDan Murphy <DMurphy@ti.com>
Thu, 6 Nov 2014 04:33:06 +0000 (22:33 -0600)
commit455098f0ec936d18990016e1ba1e8da63f9f5a39
tree3644447d06afd11f23df2afc5820a4d8abd2af43
parentd2fff964c6ddf1d4f1302eec6ec85a2d8c265f43
parente5d1309d68bad219d590ff919853e3d0a110116d
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: DRA: hwmod: RTC: Add reset function for RTC

Signed-off-by: Dan Murphy <DMurphy@ti.com>
arch/arm/mach-omap2/omap_hwmod.h
arch/arm/mach-omap2/omap_hwmod_7xx_data.c