Merge branch 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into ti-linux...
authorDan Murphy <DMurphy@ti.com>
Thu, 20 Nov 2014 17:49:58 +0000 (11:49 -0600)
committerDan Murphy <DMurphy@ti.com>
Thu, 20 Nov 2014 17:49:58 +0000 (11:49 -0600)
commitae7e16752ba952afa5dbeb472c54c501fbabef7d
tree2798e41799a9fc0b81bca12936cd1bc96b22d407
parentd68139b2657efe9b081650a16420b76a09d62d44
parent0b45378f06c77c6de40baa6875449414a745acb1
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-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:
  uapi: add missing rpmsg_socket.h to export list
  uapi: add missing rpmsg_rpc.h to export list
  virtio: fix memory leak of virtio ida cache layers
  remoteproc: fix memory leak of remoteproc ida cache layers
  net/rpmsg: move the rpmsg connection state enum into driver

Signed-off-by: Dan Murphy <DMurphy@ti.com>
include/uapi/linux/Kbuild