]> 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...
authorDan Murphy <DMurphy@ti.com>
Fri, 21 Nov 2014 15:32:27 +0000 (09:32 -0600)
committerDan Murphy <DMurphy@ti.com>
Fri, 21 Nov 2014 15:32:27 +0000 (09:32 -0600)
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: workaround for MFLAG + NV12 issue
  drm/omap: only ignore DIGIT SYNC LOST for TV output
  drm/omap: fix race with error_irq
  drm/omap: use DRM_ERROR_RATELIMITED() for error irqs

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

Trivial merge