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-linux-3.14.y
TI-Tree: git://git.ti.com/rpmsg/rpmsg.git
TI-Branch:

* 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg: (128 commits)
  ti_config_fragments: rpmsg: Add remoteproc and rpmsg modules
  net/rpmsg: add support for new rpmsg sockets
  rpmsg: add api for creating and deleting rpmsg channels
  drm/omap: flush the mapped page in kmap/kunmap
  rpmsg: rpc: introduce a new rpmsg_rpc driver
  ARM: OMAP: DRA7: change IPU1 clk domain to SWSUP for proper boot
  ARM: dts: beagle-x15: Enable IPU & DSP rproc and CMA nodes
  ARM: dts: beagle-x15: Add mailboxes, timers for rprocs
  ARM: dts: beagle-x15: Add CMA reserved memory nodes for IPUs & DSPs
  ARM: dts: dra72-evm: Enable DSP1 & IPU rproc and CMA nodes
  ARM: dts: dra72-evm: Add mailboxes, timers for rprocs
  ARM: dts: dra72-evm: Add CMA reserved memory nodes for IPUs & DSP1
  ARM: dts: dra7-evm: Add watchdog timers for IPU2
  ARM: dts: dra7-evm: Enable IPU & DSP rproc and CMA nodes
  ARM: dts: dra7-evm: Add timers to IPUs and DSPs
  ARM: dts: dra7-evm: Add mailboxes to IPU and DSP nodes
  ARM: dts: dra7-evm: Add CMA reserved memory nodes for IPUs & DSPs
  ARM: dts: DRA72x: Add aliases for rproc nodes
  ARM: dts: DRA74x: Add aliases for rproc nodes
  ARM: OMAP2+: Add pdata-quirks for DSP2 rproc on DRA74x
  ...

Conflicts:
	arch/arm/boot/dts/am57xx-beagle-x15.dts
	arch/arm/boot/dts/dra7-evm.dts
	arch/arm/boot/dts/dra72-evm.dts
	arch/arm/boot/dts/dra72x.dtsi
	arch/arm/boot/dts/dra74x.dtsi
	arch/arm/mach-omap2/pdata-quirks.c

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