author | Dan Murphy <DMurphy@ti.com> | |
Wed, 3 Jun 2015 14:55:19 +0000 (09:55 -0500) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Wed, 3 Jun 2015 14:55:19 +0000 (09:55 -0500) | ||
commit | d4d72d56fdc67603633f0168073713180934dbc0 | |
tree | 79ad7f6534a05089fb71efa5bfbfbb7796e14477 | tree | snapshot (tar.xz tar.gz zip) |
parent | 50e3fd5f9a86cb3ab6646b722d7327c0021be1f0 | commit | diff |
parent | 64e95a0b9107c55aad0947f202179d67f87e4848 | commit | diff |
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>
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 | diff1 | | diff2 | | blob | history |