]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux... ti2014.10.03
authorDan Murphy <DMurphy@ti.com>
Wed, 17 Jun 2015 13:42:52 +0000 (08:42 -0500)
committerDan Murphy <DMurphy@ti.com>
Wed, 17 Jun 2015 13:42:52 +0000 (08:42 -0500)
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: HDMI: Do not abort audio playback when display is turned off

Signed-off-by: Dan Murphy <DMurphy@ti.com>

Trivial merge