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:
  drm/omap: stop connector polling during suspend
  drm/omap: remove dummy PM functions
  ARM: DTS: am57xx-beagle-x15: Enable analog audio support
  ARM: DTS: am57xx-beagle-x15: Add node for tlv320aic3104 codec
  ARM: DTS: am57xx-beagle-x15: Enable McASP3
  ARM: DTS: am57xx-beagle-x15: Add new fixed regulator for aic3104 DVDD
  ARM: DTS: am57xx-beagle-x15: Pinctrl entry for mcasp3 pins
  ARM: DTS: am57xx-beagle-x15: Pinctrl entry for xref_clk0.clkout2
  ARM: DTS: am57xx-beagle-x15: No need to include ti-dra7-atl.h
  ARM: DTS: dra7xx-clocks: Add gate clock for CLKOUT2

Conflicts:
	arch/arm/boot/dts/am57xx-beagle-x15.dts

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