| author | Tinku Mannan <tmannan@ti.com> | |
| Wed, 13 Aug 2014 17:15:06 +0000 (13:15 -0400) | ||
| committer | Tinku Mannan <tmannan@ti.com> | |
| Wed, 13 Aug 2014 17:15:06 +0000 (13:15 -0400) | ||
| commit | cb900c91a9268da51d00f776af610e65fae31073 | |
| tree | cc6d8fe2616dd1f5bee2b8ebc5e8250626fe968b | tree | snapshot (tar.xz tar.gz zip) |
| parent | 4aefc6482044c2eb389d10021ed8b488e68e4596 | commit | diff |
| parent | 16045c55536265059abc6d120ce7e8068dd7a83a | commit | diff |
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
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