]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
Merge branch 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into ti-linux...
authorDan Murphy <DMurphy@ti.com>
Sat, 30 May 2015 17:15:54 +0000 (12:15 -0500)
committerDan Murphy <DMurphy@ti.com>
Sat, 30 May 2015 17:15:54 +0000 (12:15 -0500)
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:
  samples/rpmsg: add support for multiple instances
  Revert "ARM: OMAP: DRA7: change IPU1 clk domain to SWSUP for proper boot"
  ARM: OMAP2+: use separate IOMMU pdata to fix DRA7 IPU1 boot
  iommu/omap: fix boot issue on remoteprocs with AMMU/Unicache
  iommu/omap: add pdata ops for setting powerdomain constraint
  ARM: dts: OMAP5: Fix the standby info for IPU & DSP
  remoteproc/omap: revise the comment about standby in _suspend
  remoteproc/pruss: fix pruss_init return on error
  remoteproc/pruss: lower the trace level in pru_rproc_mbox_callback
  remoteproc/omap: fix a minor typo in a trace message
  remoteproc/omap: add support for runtime auto-suspend/resume

Signed-off-by: Dan Murphy <DMurphy@ti.com>
1  2 
arch/arm/boot/dts/omap5.dtsi
arch/arm/mach-omap2/pdata-quirks.c

Simple merge
Simple merge