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

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

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

* 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg:
  remoteproc/pruss: add support for PRU-ICSS1 on AM437x SoCs
  ARM: OMAP2+: extend pruss pdata-quirks to AM4372
  ARM: dts: AM4372: Add the PRU-ICSS1 DT node
  remoteproc/pruss: add pru-specific debugfs support
  remoteproc/pruss: add a remoteproc driver for PRUSS in TI SoCs
  remoteproc/core: introduce post loading handler
  ARM: OMAP2+: use pdata quirks for PRUSS reset lines on AM335x
  remoteproc/pruss: define platform data for PRU remoteproc
  ARM: dts: AM33xx: Add the PRUSS DT node
  Documentation: dt: add PRUSS remoteproc bindings
  remoteproc/core: add a rproc ops for performing address translation
  remoteproc: add support to handle device specific resource types
  ARM: dts: AM4372: Add PRUSS1 PRU mboxes to mailbox node
  ARM: dts: AM33xx: Add PRU mboxes to mailbox node

Conflicts:
	arch/arm/boot/dts/dra72-evm.dts
	arch/arm/mach-omap2/pdata-quirks.c

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