| #
20c93959 |
| 21-Feb-2008 |
Marian Balakowicz <m8@semihalf.com> |
Merge branch 'master' of /home/git/u-boot
|
| #
6f99eec3 |
| 14-Feb-2008 |
Wolfgang Denk <wd@denx.de> |
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>
|
| #
746c4b94 |
| 14-Feb-2008 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'wd/master'
|
| #
3f2175fa |
| 14-Feb-2008 |
Andy Fleming <afleming@freescale.com> |
Merge branch 'denx'
|
| #
0c9d42e6 |
| 21-Jan-2008 |
Niklaus Giger <niklaus.giger@netstal.com> |
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>
|
| #
94a91e24 |
| 05-Feb-2008 |
Mike Frysinger <vapier@gentoo.org> |
generate u-boot.ldr for Blackfin targets
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
| #
8d79953d |
| 13-Jan-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
|
| #
3b93020d |
| 09-Jan-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/master/
|
| #
6a40ef62 |
| 09-Jan-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge git://www.denx.de/git/u-boot
Conflicts:
board/tqm5200/tqm5200.c
|
| #
a2df4da3 |
| 09-Dec-2007 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
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>
|
| #
4985ca5a |
| 07-Jan-2008 |
Peter Pearse <peter.pearse@arm.com> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
9caeaadf |
| 11-Dec-2007 |
Stefan Roese <sr@denx.de> |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/Makefile
|
| #
7fc79289 |
| 28-Nov-2007 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
|
| #
83c5c9b7 |
| 27-Nov-2007 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'wd/master'
|
| #
1b4aaffe |
| 24-Sep-2007 |
Grant Likely <grant.likely@secretlab.ca> |
Add .gitignore files
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
|