]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
Merge branch 'rpmsg-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into rpmsg-ti-linux...
authorSuman Anna <s-anna@ti.com>
Tue, 1 Sep 2015 19:12:34 +0000 (14:12 -0500)
committerSuman Anna <s-anna@ti.com>
Tue, 1 Sep 2015 19:12:50 +0000 (14:12 -0500)
Pull in a minor fix in the rpmsg-proto driver that removes the
include of a header file that should not have been included
directly.

* 'rpmsg-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg:
  net/rpmsg: remove rwlock.h header inclusion

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

Trivial merge