You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/01/02 20:40:06 UTC
[incubator-nuttx] 02/03: Merge branch 'master' of
github.com:apache/incubator-nuttx
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit dfe74fc4cf9b314b3db3de83a2225012168726d4
Merge: c854b1f 065ec87
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Thu Jan 2 14:38:27 2020 -0600
Merge branch 'master' of github.com:apache/incubator-nuttx
arch/arm/src/imxrt/imxrt_enet.c | 55 ++++++++++++++++++++---------------------
arch/arm/src/stm32/stm32_fmc.c | 4 +--
2 files changed, 29 insertions(+), 30 deletions(-)