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: dts: dra7-evm-lcd10: Set audio codec i2c address
  ARM: dts: DRA7: Fix a McASP3 property name typo
  ARM: DTS: dra72-evm: Add aliases for sound cards
  ARM: DTS: dra7-evm: Add aliases for sound cards
  ASoC: omap-hdmi-audio: Use HDMI HW IP alias for the card
  ASoC: simple-card: Pass a card id hint for non-dt case
  ASoC: core: Pass card index through dt alias
  ALSA: core: Add module param array to exclude card slots from automatic assignment

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