Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux...
authorTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Thu, 8 Jan 2015 09:20:58 +0000 (03:20 -0600)
committerTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Thu, 8 Jan 2015 09:20:58 +0000 (03:20 -0600)
commit2c89c3d50e4d5b791d898ea414ee51bb5ded4498
treeffe1473604e2dcd2964d25bb24078e2f57d7db8c
parent40f5a8cbeb8f34a7be155160cfdc3fa8b4d74dd5
parent49329020ac43f481c186ccc2469e91bae2d23c4e
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: fix programming of the control module

Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>