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

2011-01-17 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* shared/start/start.S: Remove conflict lines in comments.
This commit is contained in:
Joel Sherrill
2011-01-17 14:48:25 +00:00
parent 29badca6c1
commit 25edf9cdfd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/powerpc/ChangeLog
View File

@@ -1,3 +1,7 @@
2011-01-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* shared/start/start.S: Remove conflict lines in comments.
2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de> 2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/uboot_dump_bdinfo.c: Include <bsp/u-boot.h> if necessary. * shared/uboot_dump_bdinfo.c: Include <bsp/u-boot.h> if necessary.

4
c/src/lib/libbsp/powerpc/shared/start/start.S
View File

@@ -7,11 +7,7 @@
* found in found in the file LICENSE in this distribution or at * found in found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE. * http://www.rtems.com/license/LICENSE.
* *
<<<<<<< start.S
* $Id$ * $Id$
=======
* $Id$
>>>>>>> 1.25
* *
*/ */