| #
f61f1e15 |
| 21-Oct-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
|
| #
50bd0057 |
| 21-Oct-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
|
| #
f82642e3 |
| 18-Oct-2008 |
Wolfgang Denk <wd@denx.de> |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
| #
6d0f6bcf |
| 16-Oct-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
| #
794a5924 |
| 10-Jul-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot
|
| #
32d4e38e |
| 11-Jun-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
|
| #
3b904ccb |
| 09-Jun-2008 |
Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> |
net: Conditional COBJS inclusion of network drivers
Replace COBJS-y with appropriate driver config names.
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Signed-off-by: Ben Warren <bigg
net: Conditional COBJS inclusion of network drivers
Replace COBJS-y with appropriate driver config names.
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
show more ...
|
| #
20c93959 |
| 21-Feb-2008 |
Marian Balakowicz <m8@semihalf.com> |
Merge branch 'master' of /home/git/u-boot
|
| #
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'
|
| #
1b769881 |
| 25-Jan-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
Fix remaining CONFIG_COMMANDS
update comments
Fix coding style
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
| #
6a40ef62 |
| 09-Jan-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge git://www.denx.de/git/u-boot
Conflicts:
board/tqm5200/tqm5200.c
|
| #
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
|
| #
f743931f |
| 06-Dec-2007 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'wd/master'
|
| #
521dcd30 |
| 06-Dec-2007 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
|
| #
fe08fb65 |
| 26-Nov-2007 |
Wolfgang Denk <wd@denx.de> |
Merge commit '87ddedd'
|
| #
2439e4bf |
| 21-Nov-2007 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
drivers/net : move net drivers to drivers/net
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|