Merge branch 'master' into connectivity-abstraction
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 11 Dec 2014 22:59:10 +0000 (14:59 -0800)
committerSudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 11 Dec 2014 22:59:10 +0000 (14:59 -0800)
commit07036c2aefc07526a86df698942975286a08a5c8
tree82102c5cc51c75c5f3297d32046cf4c88d292f31
parent88df85f0c20992acba7c96a85a1007916923b448
parentf18bc832742ae26e90f26374b78132bf9634f125
Merge branch 'master' into connectivity-abstraction

Conflicts:
resource/csdk/makefile
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/src/ocstack.c