| #
c645b181 |
| 08-Dec-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-net
|
| #
1cb82a92 |
| 07-Nov-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
drivers/bios_emulator: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
| #
d4d1e9be |
| 19-Oct-2007 |
Andy Fleming <afleming@freescale.com> |
Merge branch 'denx'
|
| #
b90296fc |
| 02-Oct-2007 |
Haavard Skinnemoen <hskinnemoen@atmel.com> |
Merge commit 'origin/master'
|
| #
636538c5 |
| 27-Sep-2007 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/lwmon5
|
| #
b8685aff |
| 22-Sep-2007 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
Merge git://www.denx.de/git/u-boot
Conflicts:
CREDITS
|
| #
f930922f |
| 17-Sep-2007 |
Markus Klotzbuecher <mk@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
9c73f4b8 |
| 10-Sep-2007 |
Michal Simek <monstr@monstr.eu> |
Merge git://www.denx.de/git/u-boot
|
| #
fd63d832 |
| 08-Sep-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/raj/git/u-boot#ads5121_fixes
|
| #
470ffef7 |
| 07-Sep-2007 |
Peter Pearse <peter.pearse@arm.com> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
1d2ca446 |
| 30-Aug-2007 |
Jason Jin <Jason.jin@freescale.com> |
Add BUILD_DIR support for bios emulator.
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
|
| #
93f79834 |
| 21-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
|
| #
19909edb |
| 15-Aug-2007 |
Michal Simek <monstr@monstr.eu> |
Merge git://www.denx.de/git/u-boot into merge
|
| #
b706d635 |
| 15-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
d61ea148 |
| 15-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
3b3bff4c |
| 14-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
d1bc6c8d |
| 13-Aug-2007 |
Ben Warren <bwarren@qstreams.com> |
Sync'd u-boot-net with mainline
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/bcm570x.c
drivers/tigon3.c
|
| #
375c2c9e |
| 13-Aug-2007 |
Haavard Skinnemoen <hskinnemoen@atmel.com> |
Merge commit 'upstream/master'
|
| #
b0d2962f |
| 09-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with git+ssh://atlas/home/wd/git/u-boot/master
|
| #
2ee8078f |
| 09-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/work
|
| #
0dc4279b |
| 07-Aug-2007 |
Jason Jin <Jason.jin@freescale.com> |
Minor fix for bios emulator makefile
Add $(obj) to LIB avoiding objects be built in the source dir
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
|
| #
2c4faea8 |
| 09-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx
|
| #
78549bbf |
| 07-Aug-2007 |
Markus Klotzbuecher <mk@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
85fad497 |
| 07-Aug-2007 |
Michal Simek <monstr@monstr.eu> |
Merge git://www.denx.de/git/u-boot
|
| #
b23b5475 |
| 07-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/tur/git/u-boot#cm5200-si
|