]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
Merge branch 'rproc-linux-3.14.y' of git://git.ti.com/rpmsg/remoteproc into rpmsg...
authorSuman Anna <s-anna@ti.com>
Tue, 26 May 2015 21:00:14 +0000 (16:00 -0500)
committerSuman Anna <s-anna@ti.com>
Tue, 26 May 2015 21:01:16 +0000 (16:01 -0500)
Pull in couple of minor patches from the remoteproc feature tree,
one is a minor bug fix in PRUSS remoteproc driver, and the other
is a comment correction in OMAP remoteproc driver.

* 'rproc-linux-3.14.y' of git://git.ti.com/rpmsg/remoteproc:
  remoteproc/omap: revise the comment about standby in _suspend
  remoteproc/pruss: fix pruss_init return on error

Signed-off-by: Suman Anna <s-anna@ti.com>

Trivial merge