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

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:
  ARM: DRA7: hwmod: Fix CAL hwmod flag to allow sw supervised standby
  media: ti-vpe: vip: Fix format enumeration to match sensor capabilities
  media: ti-vpe: vip: Fix enuminput error
  media: ti-vpe: vip: Fix priority parameter checking
  media: ti-vpe: vip: Fix frame format and intervals enumerations
  media: ti-vpe: vip: Fix multiple device open

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