Stefan Roese
|
f2302d4430
|
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
|
2008-08-06 14:05:38 +02:00 |
|
Jean-Christophe PLAGNIOL-VILLARD
|
51ecde946f
|
gitignore: udpate stgit generated and .patch file
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
2008-04-18 00:22:08 -07:00 |
|
Wolfgang Denk
|
6f99eec3dc
|
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Conflicts:
Makefile
doc/README.standalone
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
2008-02-15 00:06:18 +01:00 |
|
Niklaus Giger
|
0c9d42e6b0
|
Add *~ to .gitignore
One should never add a backup file ending in with ~ to the git repository.
Signed-off-by: Niklaus Giger <niklaus.giger@netstal.com>
|
2008-02-14 00:54:23 +01:00 |
|
Mike Frysinger
|
94a91e248b
|
generate u-boot.ldr for Blackfin targets
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
2008-02-04 19:26:57 -05:00 |
|
Jean-Christophe PLAGNIOL-VILLARD
|
a2df4da31b
|
Add missing file in gitignore and comments
based on Linux source tree's .gitignore files
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
2008-01-09 11:53:45 +01:00 |
|
Grant Likely
|
1b4aaffe4f
|
Add .gitignore files
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
|
2007-11-15 08:46:46 -07:00 |
|