Merge branch 'rpmsg-1.20' into master
authorSuman Anna <s-anna@ti.com>
Wed, 23 May 2012 03:48:26 +0000 (22:48 -0500)
committerSuman Anna <s-anna@ti.com>
Wed, 23 May 2012 03:51:36 +0000 (22:51 -0500)
commit35ce4f0c3387382bca34356358ed0760f4bd7348
treefee8e6d470aa35d69acdb7ade735631d2974aef0
parentc5716288a6d85e0a8303e4886c7ed10cdbd64ca1
parent4e9b421fb3a41681937908105f9d405609e1e08f
Merge branch 'rpmsg-1.20' into master

Merged 1.20.02.04 into master in preparation for a
newer version of sysbios-rpmsg to support SMP/BIOS
with v3.4 kernel.

Conflicts:
src/ti/examples/srvmgr/resmgr_task.c
src/ti/resources/IpcMemory.xdt
src/ti/resources/IpcMemory.xs
src/ti/resources/package.bld
src/ti/resources/package.xs
src/ti/resources/rsc_table.h

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