| author | Dan Murphy <DMurphy@ti.com> | |
| Thu, 25 Sep 2014 16:34:02 +0000 (11:34 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Thu, 25 Sep 2014 16:34:02 +0000 (11:34 -0500) | ||
| commit | c3ff231561ba0a055e87e00f4e50807e9185add1 | |
| tree | 21bbb87586ad782dc6d3be26948cf948185b8914 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 023238d8d5564ed486b23ffeab41e913316b5369 | commit | diff |
| parent | 777eb46643909f512128919d232f707dc0a869f3 | 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:
drm/tilcdc: disable the lcd controller/dma engine when suspend invoked
drm/tilcdc: make frame_done interrupt active at all times
ARM: dts: split dra7xx lcd .dts files
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:
drm/tilcdc: disable the lcd controller/dma engine when suspend invoked
drm/tilcdc: make frame_done interrupt active at all times
ARM: dts: split dra7xx lcd .dts files
Signed-off-by: Dan Murphy <DMurphy@ti.com>
| arch/arm/boot/dts/dra7-evm.dts | diff1 | | diff2 | | blob | history |
| arch/arm/boot/dts/dra72-evm.dts | diff1 | | diff2 | | blob | history |