author | Dan Murphy <DMurphy@ti.com> | |
Wed, 26 Nov 2014 10:33:03 +0000 (04:33 -0600) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Wed, 26 Nov 2014 10:33:03 +0000 (04:33 -0600) |
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:
OMAPDSS: adopt pinctrl support
arm: dts: am437x-gp-evm: Add sleep pinctrl state for dss
arm: dts: am43x-epos-evm: Add sleep pinctrl state for dss
Signed-off-by: Dan Murphy <DMurphy@ti.com>
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:
OMAPDSS: adopt pinctrl support
arm: dts: am437x-gp-evm: Add sleep pinctrl state for dss
arm: dts: am43x-epos-evm: Add sleep pinctrl state for dss
Signed-off-by: Dan Murphy <DMurphy@ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/am437x-gp-evm.dts | patch | | diff1 | | diff2 | | blob | history |
arch/arm/boot/dts/am43x-epos-evm.dts | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/am437x-gp-evm.dts
Simple merge
diff --cc arch/arm/boot/dts/am43x-epos-evm.dts
Simple merge