| #
38b189fe |
| 26-Mar-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
|
| #
0207fefa |
| 26-Mar-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-usb
|
| #
c7057b52 |
| 26-Mar-2008 |
Dave Liu <r63238@freescale.com> |
ata: add the support for SATA framework
- add the SATA framework
- add the SATA command line
Signed-off-by: Dave Liu <daveliu@freescale.com>
|
| #
b8685aff |
| 22-Sep-2007 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
Merge git://www.denx.de/git/u-boot
Conflicts:
CREDITS
|
| #
93f79834 |
| 21-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
|
| #
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'
|
| #
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
|
| #
f2c2a937 |
| 05-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
|
| #
46919751 |
| 05-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc85xx
|
| #
6bf6f114 |
| 03-Aug-2007 |
Andy Fleming <afleming@freescale.com> |
Merge branch 'testing' into working
Conflicts:
CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
Merge branch 'testing' into working
Conflicts:
CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
net/eth.c
show more ...
|
| #
bc296248 |
| 13-Jul-2007 |
Michal Simek <monstr@monstr.eu> |
Merge git://www.denx.de/git/u-boot
|
| #
fd363519 |
| 11-Jul-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/tur/git/u-boot#cm1_qp1
|
| #
9e04033d |
| 11-Jul-2007 |
Kim Phillips <kim.phillips@freescale.com> |
Merge git://www.denx.de/git/u-boot
|
| #
53629f43 |
| 11-Jul-2007 |
Stefan Roese <sr@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
98c80b46 |
| 10-Jul-2007 |
John Rigby <jrigby@freescale.com> |
Merge branch 'master' into u-boot-5329-early
|
| #
b3aff0cb |
| 10-Jul-2007 |
Jon Loeliger <jdl@freescale.com> |
disk/ doc/ lib_*/ and tools/: Remove lingering references to CFG_CMD_* symbols.
Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always
disk/ doc/ lib_*/ and tools/: Remove lingering references to CFG_CMD_* symbols.
Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
show more ...
|
| #
cde5c64d |
| 09-Jul-2007 |
Jon Loeliger <jdl@freescale.com> |
disk/: Remove obsolete references to CONFIG_COMMANDS
Signed-off-by: Jon Loeliger <jdl@freescale.com>
|
| #
bf6a9ca9 |
| 09-Jul-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/hs/Atronic/u-boot
|