Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux...
authorDan Murphy <dmurphy@ti.com>
Tue, 11 Nov 2014 18:56:33 +0000 (12:56 -0600)
committerDan Murphy <dmurphy@ti.com>
Tue, 11 Nov 2014 18:56:33 +0000 (12:56 -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:
  media: ti-vpfe: Fix format enumeration to match sensor capabilities
  media: sensor: ov2659: Fix kernel panic under v4l2-compliance test
  media: ti-vpfe: Fix a race condition during release
  drm/omap: do omap_crtc_flush on dev_lastclose
  drm/omap: tiler: fix race condition with engine->async
  OMAPDSS: DISPC: lock access to DISPC_CONTROL & DISPC_CONFIG

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

Trivial merge