Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux...

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: (45 commits)
  ARM: DTS: am57xx-beagle-x15: Correct audio route information
  drm/omap: do not use BUG_ON(!spin_is_locked(x))
  OMAPDSS: fix paddr check for TILER addresses
  v4l: ti-vpe: vpe: configure line mode separately
  v4l: ti-vpe: vpdma: Clear IRQs for individual lists
  v4l: ti-vpe: vip: Clear interrupts when closing
  v4l: ti-vpe: vip: fix vip_set_clock_enable for multi slice
  v4l: ti-vpe: vpdma: Make list post atomic operation
  v4l: ti-vpe: vip: remove compiler warnings
  v4l: ti-vpe: vip: Invert clock via SMA_SW1 for falling edge
  v4l: ti-vpe: vip: correct framerate numerator/denominator values
  v4l: ti-vps: vip: Cleanup VPDMA lists in close
  v4l: ti-vps: vpdma: Add abort channel desc and cleanup APIs
  v4l: ti-vpe: vip: Flush Q/DQ lists even if not streaming
  v4l: ti-vpe: vpdma: Add support for setting max width height
  v4l: ti-vpe: vip: Add optional ioctls for ctrl and std
  v4l: ti-vpe: Free vpdma buffers in vpe_release
  v4l: ti-vpe: vpe: Return NULL for invalid buffer type
  v4l: ti-vpe: Increasing max buffer height and width
  media: ti-vpe: Add support for SEQ_TB buffers
  ...

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

diff --cc arch/arm/boot/dts/am57xx-beagle-x15.dts
Simple merge