Merge branch 'master' of https://gitee.com/openLuat/LuatOS

# Conflicts:
#	components/network/adapter/luat_network_adapter.c

components/network/adapter/luat_network_adapter.c

@@ -151,8 +151,8 @@ extern void DBG_Printf(const char* format, ...);
 extern void DBG_HexPrintf(void *Data, unsigned int len);
 //#define DBG(x,y...)		DBG_Printf("%s %d:"x"\r\n", __FUNCTION__,__LINE__,##y)
 //#define DBG_ERR(x,y...)		DBG_Printf("%s %d:"x"\r\n", __FUNCTION__,__LINE__,##y)
-static int tls_random( void *p_rng,
-        unsigned char *output, size_t output_len );
+static int tls_random( void *p_rng,
+        unsigned char *output, size_t output_len );
 
 #define __NW_DEBUG_ENABLE__
 #ifdef __NW_DEBUG_ENABLE__