| 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) |
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-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>
| 1 | 2 | |||
|---|---|---|---|---|
| arch/arm/mach-omap2/omap_hwmod_7xx_data.c | patch | | diff1 | | diff2 | | blob | history |
Simple merge