| #
d3c23a79 |
| 20-Aug-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'next' of git://git.denx.de/u-boot-avr32
Conflicts:
MAINTAINERS
|
| #
28ac6719 |
| 14-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
|
| #
becbbc7b |
| 14-Aug-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
|
| #
2fd0aad4 |
| 13-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
|
| #
00b1883a |
| 12-Aug-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
drivers/mtd: Move conditional compilation to Makefile
rename CFG_FLASH_CFI_DRIVER to CONFIG_FLASH_CFI_DRIVER
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
| #
b90296fc |
| 02-Oct-2007 |
Haavard Skinnemoen <hskinnemoen@atmel.com> |
Merge commit 'origin/master'
|
| #
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
|
| #
93f79834 |
| 21-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
|
| #
909627dc |
| 18-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/custodian/u-boot-coldfire
|
| #
8280f6a1 |
| 18-Aug-2007 |
Stefan Roese <sr@denx.de> |
Coding style cleanup
Signed-off-by: Stefan Roese <sr@denx.de>
|
| #
a605aacd |
| 16-Aug-2007 |
TsiChungLiew <Tsi-Chung.Liew@freescale.com> |
ColdFire: Add M5249EVB platform for MCF52x2
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
|