Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux...
authorDan Murphy <DMurphy@ti.com>
Wed, 26 Nov 2014 10:33:03 +0000 (04:33 -0600)
committerDan Murphy <DMurphy@ti.com>
Wed, 26 Nov 2014 10:33:03 +0000 (04:33 -0600)
commitce9e59e74df6e4c9a3dcefc778e124440087bb84
treeeceb5ba1e15da4aebc7e18ba3b6427752c83c5e0
parent006e797d4ec025a59e8d4b54e340d2eeb900cc5e
parent336489966f7746cebbf406aa005adee053085849
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:
  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>
arch/arm/boot/dts/am437x-gp-evm.dts
arch/arm/boot/dts/am43x-epos-evm.dts