]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commit
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <DMurphy@ti.com>
Wed, 3 Jun 2015 14:55:19 +0000 (09:55 -0500)
committerDan Murphy <DMurphy@ti.com>
Wed, 3 Jun 2015 14:55:19 +0000 (09:55 -0500)
commitd4d72d56fdc67603633f0168073713180934dbc0
tree79ad7f6534a05089fb71efa5bfbfbb7796e14477
parent50e3fd5f9a86cb3ab6646b722d7327c0021be1f0
parent64e95a0b9107c55aad0947f202179d67f87e4848
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: DRA7: hwmod: Fix gpmc hwmod

Conflicts:
arch/arm/mach-omap2/omap_hwmod_7xx_data.c

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