Merge branch 'maint-ti-linux-3.14.y' of...

Merge branch 'maint-ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel-maint into ti-linux-3.14.y

TI-Feature: ti-linux-3.14-maint
TI-Tree: git://git.ti.com/ti-linux-kernel/ti-linux-kernel-maint.git
TI-Branch: maint-ti-linux-3.14.y

* 'maint-ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel-maint

: (22 commits)
  ti_config_fragments/audio_display: Replace DRM_OMAP_WB_M2M with DRM_OMAP_WB
  drm/omap: DISPC: Fix field order for HDMI
  drm/omap: omap_wb_m2m: Fix buffer clean-up issue.
  drm/omap: omap_wb_m2m: Fix buffer type g/s_selection
  drm/omap: omap_wb_m2m: Set num_planes for default format
  drm/omap: omap_wb_m2m: S_FMT ioctl cannot fail
  drm/omap: omap_wb_m2m: Set WB mode only when device is opened
  drm/omap: Add top level WB support driver
  drm/omap: Move WB struct to its own header file
  drm/omap: omap_wb_m2m: Add a top level device struct
  drm/omap: omap_wb_m2m: Replace fourcc_to_str with a macro
  drm/omap: omap_wb_m2m: Keep current format and size in a v4l2 container
  drm/omap: omap_wb_m2m: Make internal vb2 queue struct mode agnostic
  drm/omap: omap_wb_m2m: Make internal format table and struct mode agnostic
  drm/omap: omap_wb_m2m: Cleanup un-needed inlude files
  drm/omap: omap_wb_m2m: Use v4l2_fh_is_singular_file instead of instance counter
  drm/omap: omap_wb_m2m: Remove redundant lock/unlock member functions
  drm/omap: omap_wb_m2m: Disable unnecessary kernel message
  drm/omap: fix WBDELAYCOUNT for HDMI
  drm/omap: Add pclk setting case when channel is DSS_WB
  ...

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