| author | Dan Murphy <DMurphy@ti.com> | |
| Thu, 5 Mar 2015 19:41:50 +0000 (13:41 -0600) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Thu, 5 Mar 2015 19:41:50 +0000 (13:41 -0600) | ||
| commit | 406ea53cddf49a84f31f3445704de25ccdd2be30 | |
| tree | aff2e6f6c88a9391ffe526dc3606f2f2f5d1691f | tree | snapshot (tar.xz tar.gz zip) |
| parent | 72a9d1f3458f2e22aa477b20122a92bacb5ab523 | commit | diff |
| parent | 74bf3e2b9490fc55035788d8892b0dc16cd4d1b8 | 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/omap: fix stride vs pixel size check
OMAPDSS: DISPC: fix predecimation for YUV modes
ARM: dts: dra7-evm: remove HDMI HPD pinmux
ARM: dts: dra7-evm: remove vout1 pinmux
drm/omap: add manager properties
Conflicts:
arch/arm/boot/dts/dra7-evm.dts
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/omap: fix stride vs pixel size check
OMAPDSS: DISPC: fix predecimation for YUV modes
ARM: dts: dra7-evm: remove HDMI HPD pinmux
ARM: dts: dra7-evm: remove vout1 pinmux
drm/omap: add manager properties
Conflicts:
arch/arm/boot/dts/dra7-evm.dts
Signed-off-by: Dan Murphy <DMurphy@ti.com>
| arch/arm/boot/dts/dra7-evm.dts | diff1 | | diff2 | | blob | history |