Merge branch 'multi-proc'
authorTinku Mannan <tmannan@ti.com>
Wed, 13 Aug 2014 17:15:06 +0000 (13:15 -0400)
committerTinku Mannan <tmannan@ti.com>
Wed, 13 Aug 2014 17:15:06 +0000 (13:15 -0400)
commitcb900c91a9268da51d00f776af610e65fae31073
treecc6d8fe2616dd1f5bee2b8ebc5e8250626fe968b
parent4aefc6482044c2eb389d10021ed8b488e68e4596
parent16045c55536265059abc6d120ce7e8068dd7a83a
Merge branch 'multi-proc'

Conflicts:
ti/runtime/netapi/src/netapi_init.c
ti/runtime/netapi/src/netapi_loc.h
ti/runtime/netapi/test/net_test_bench.c
ti/runtime/netapi/test/net_test_router.c
ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c
ti/runtime/netapi/src/netapi_init.c
ti/runtime/netapi/src/netapi_loc.h
ti/runtime/netapi/src/netapi_sec.c
ti/runtime/netapi/src/pktio.c
ti/runtime/netapi/test/net_test_bench.c
ti/runtime/netapi/test/net_test_loopback.c
ti/runtime/netapi/test/net_test_router.c
ti/runtime/netapi/test/net_test_sa_utils.c
ti/runtime/netapi/test/net_test_utils.h
ti/runtime/netapi/utils/netapi_util_rm.c