Merge branch '3.30' into ipc-next

author Robert Tivy <rtivy@ti.com>

Fri, 27 Feb 2015 19:21:00 +0000 (11:21 -0800)

committer Robert Tivy <rtivy@ti.com>

Fri, 27 Feb 2015 19:21:00 +0000 (11:21 -0800)
author Robert Tivy <rtivy@ti.com>
Fri, 27 Feb 2015 19:21:00 +0000 (11:21 -0800)
committer Robert Tivy <rtivy@ti.com>
Fri, 27 Feb 2015 19:21:00 +0000 (11:21 -0800)
diff --cc qnx/src/ipc3x_dev/ti/syslink/ipc/hlos/knl/transports/virtio/VirtQueue.c
Simple merge
author	Robert Tivy <rtivy@ti.com>
	Fri, 27 Feb 2015 19:21:00 +0000 (11:21 -0800)
committer	Robert Tivy <rtivy@ti.com>
	Fri, 27 Feb 2015 19:21:00 +0000 (11:21 -0800)