diff options
| author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2008-07-18 07:38:55 +0000 |
|---|---|---|
| committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2008-07-18 07:38:55 +0000 |
| commit | e5aa0d1b66247e41722ea61a563af493ff988094 (patch) | |
| tree | 7089139bcade2d326c63916c2cb03ea7cdca65f4 /c | |
| parent | Correct message. (diff) | |
| download | rtems-e5aa0d1b66247e41722ea61a563af493ff988094.tar.bz2 | |
resolved conflict
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/gen83xx/ChangeLog | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog index b3ddac2d9f..d030c18f2a 100644 --- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog @@ -1,15 +1,12 @@ -<<<<<<< ChangeLog -2008-05-15 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> +2008-07-18 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> * network/network.c: mpc8249eamds uses gmii mode -======= 2008-07-17 Ralf Corsépius <ralf.corsepius@rtems.org> * configure.ac: Remove RTEMS_AMPOLISH3. ->>>>>>> 1.31 2008-07-14 Sebastian Huber <sebastian.huber@embedded-brains.de> * irq/irq_init.c, irq/irq.h, startup/linkcmds: |