| author | Dan Murphy <DMurphy@ti.com> | |
| Fri, 18 Jul 2014 18:48:01 +0000 (13:48 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Fri, 18 Jul 2014 18:48:01 +0000 (13:48 -0500) | ||
| commit | fc907b1464b03aa571a1003020bf711da041e5aa | |
| tree | c97b920f673e4c4620bb4ee0570885cb47902e89 | tree | snapshot (tar.xz tar.gz zip) |
| parent | c624da37f69521e4afb45ce72b97978613758e03 | commit | diff |
| parent | 6d2de7257f7d5a02c613cce27446658aba37eb7a | commit | diff |
Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree into ti-linux-3.14.y
TI-Feature: audio-display
TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-3.14.y
* 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
ARM: dts: dra7: add the necessary node for vpe support
ARM: DRA7: hwmod: add the necessary hwmod entries for VPE module
drm/omap: fix incorrect merge from mainline for ti-linux-3.14.y
Signed-off-by: Dan Murphy <DMurphy@ti.com>
TI-Feature: audio-display
TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-3.14.y
* 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
ARM: dts: dra7: add the necessary node for vpe support
ARM: DRA7: hwmod: add the necessary hwmod entries for VPE module
drm/omap: fix incorrect merge from mainline for ti-linux-3.14.y
Signed-off-by: Dan Murphy <DMurphy@ti.com>
| arch/arm/boot/dts/dra7.dtsi | diff1 | | diff2 | | blob | history |
| arch/arm/mach-omap2/omap_hwmod_7xx_data.c | diff1 | | diff2 | | blob | history |