| author | Dan Murphy <dmurphy@ti.com> | |
| Wed, 10 Apr 2013 16:49:25 +0000 (11:49 -0500) | ||
| committer | Dan Murphy <dmurphy@ti.com> | |
| Wed, 10 Apr 2013 16:49:25 +0000 (11:49 -0500) | ||
| commit | 15b1cda3d0183e6ca57baf66cf584c8a65dafddd | |
| tree | 2bf476debaa28d09d256c430f61ade7f8d1dfdb6 | tree | snapshot (tar.xz tar.gz zip) |
| parent | d22e3d032af39530a1011694d32a591cad63e352 | commit | diff |
| parent | d769fc4f2bc4f314a00ab3c58da437c4ee0c8086 | commit | diff |
Merge branch 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree into ti-linux-3.8.y
TI-Feature: omap5_audio_video_base
TI-Tree: git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree
TI-Branch: omap5_audio_video-3.8.y
* 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree:
ARM: OMAP: Display: Create omapdrm inside display
ARM: OMAP2+: Enable DSS and OMAPDRM
Conflicts:
arch/arm/configs/omap2plus_defconfig
Signed-off-by: Dan Murphy <dmurphy@ti.com>
TI-Feature: omap5_audio_video_base
TI-Tree: git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree
TI-Branch: omap5_audio_video-3.8.y
* 'omap5_audio_video-3.8.y' of git://gitorious.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree:
ARM: OMAP: Display: Create omapdrm inside display
ARM: OMAP2+: Enable DSS and OMAPDRM
Conflicts:
arch/arm/configs/omap2plus_defconfig
Signed-off-by: Dan Murphy <dmurphy@ti.com>
| arch/arm/configs/omap2plus_defconfig | diff1 | | diff2 | | blob | history |
| arch/arm/mach-omap2/Makefile | diff1 | | diff2 | | blob | history |