author | Dan Murphy <DMurphy@ti.com> | |
Tue, 30 Sep 2014 15:33:56 +0000 (10:33 -0500) | ||
committer | Dan Murphy <DMurphy@ti.com> | |
Tue, 30 Sep 2014 15:33:56 +0000 (10:33 -0500) | ||
commit | 0d851574d4f921608f5f9c1ff13c7d1cb6e95199 | |
tree | d0485acd31b6b3a082c9e66277d88289b46025c2 | tree | snapshot (tar.xz tar.gz zip) |
parent | cce78161d9b0843627c6f00aff35fc9d513087c8 | commit | diff |
parent | caea1f2be1d20c9a2329ce5569fad3d0656ed122 | 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:
ARM: dra7.dtsi: Add audio related parameters to hdmi node
ASoC: davinci-mcasp: Save and restore the serializer registers on suspend
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:
ARM: dra7.dtsi: Add audio related parameters to hdmi node
ASoC: davinci-mcasp: Save and restore the serializer registers on suspend
Signed-off-by: Dan Murphy <DMurphy@ti.com>