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, 18 Nov 2014 23:25:40 +0000 (17:25 -0600)
committerSuman Anna <s-anna@ti.com>
Tue, 18 Nov 2014 23:26:28 +0000 (17:26 -0600)
commit0b45378f06c77c6de40baa6875449414a745acb1
tree9ab4d8bf7ab7d4a00237a43a295c8da3a1512837
parentb57633b5196d839ac55f414649ca83c02d67c2fd
parent95dc0aab84affc627edd1c6b69f871cb682f3c2e
Merge branch 'rpmsg-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into rpmsg-ti-linux-3.14.y

Pull in couple of patches from the rpmsg feature branch to export
the rpmsg client driver headers with 'make headers_install'. Also
includes minor relocation of a structure in rpmsg_socket.h header.

* 'rpmsg-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg:
  uapi: add missing rpmsg_socket.h to export list
  uapi: add missing rpmsg_rpc.h to export list
  net/rpmsg: move the rpmsg connection state enum into driver

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