Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux... ti2014.10.00
authorDan Murphy <DMurphy@ti.com>
Fri, 10 Oct 2014 17:29:20 +0000 (12:29 -0500)
committerDan Murphy <DMurphy@ti.com>
Fri, 10 Oct 2014 17:29:20 +0000 (12:29 -0500)
commit4590fc1f771056d620bf964af7202fea7f743380
tree4d896e63413553c04e22cdea4cb1f7ca1570cf9f
parent78ae6d52181a7e44db553e49e28d4049f56b3caf
parent7d2e88abf70065bf3644f2810ada245b986d7a01
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/tilcdc: make frame completion interrupt always enabled
  drm/tilcdc: correct the dmachannel tracking logic

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