| author | Dan Murphy <DMurphy@ti.com> | |
| Tue, 2 Jun 2015 17:05:14 +0000 (12:05 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Tue, 2 Jun 2015 17:05:14 +0000 (12:05 -0500) | ||
| commit | f1ea93d3c6f1dd209529ce1e3da8a761bb3e5bac | |
| tree | e0974c95ebdf66c998e2428d5d3af271a0ae323f | tree | snapshot (tar.xz tar.gz zip) |
| parent | c12a0f63ff2636cb406f249ca286d1d80bbac5c8 | commit | diff |
| parent | 751538848cfa150c6ff8ff5a12add7ea456e881d | 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 from preventing core suspend
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 from preventing core suspend
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 |