RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

resolved conflict

Browse Source
This commit is contained in:
Thomas Doerfler
2008-07-18 07:38:55 +00:00
parent d4502b445d
commit e5aa0d1b66
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
View File

@@ -1,15 +1,12 @@
<<<<<<< ChangeLog 2008-07-18 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
2008-05-15 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* network/network.c: * network/network.c:
mpc8249eamds uses gmii mode mpc8249eamds uses gmii mode
=======
2008-07-17 Ralf Corsépius <ralf.corsepius@rtems.org> 2008-07-17 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Remove RTEMS_AMPOLISH3. * configure.ac: Remove RTEMS_AMPOLISH3.
>>>>>>> 1.31
2008-07-14 Sebastian Huber <sebastian.huber@embedded-brains.de> 2008-07-14 Sebastian Huber <sebastian.huber@embedded-brains.de>
* irq/irq_init.c, irq/irq.h, startup/linkcmds: * irq/irq_init.c, irq/irq.h, startup/linkcmds: