Merge branch 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into ti-linux...

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>

diff --cc include/uapi/linux/Kbuild
Simple merge