Resolve merge conflicts
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1821 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
4544082672
commit
f0fc621537
@ -1418,6 +1418,8 @@ nuttx-0.4.7 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
* configs/eagle100/nettest: Added an examples/nettest configuration for the
|
||||
Micromint Eagle100 board.
|
||||
* Documentation/NuttxPortingGuide.html: Added a section on NuttX device drivers.
|
||||
* configs/eagle100/httpd: Added an examples/uip configuration for the
|
||||
Micromint Eagle100 board.
|
||||
* arch/arm/src/lm3s: Added an SSI driver for the LM3S6918
|
||||
* examples/nsh: Added MMC/SD support for the LM3S6918
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user