| #
cb547320 |
| 17-Dec-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
show more ...
|
| #
13d36ec8 |
| 08-Dec-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-at91
|
| #
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>
|
| #
6a40ef62 |
| 09-Jan-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge git://www.denx.de/git/u-boot
Conflicts:
board/tqm5200/tqm5200.c
|
| #
74ac5fac |
| 08-Jan-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'inka4x0-ng' of /home/m8/git/u-boot/
|
| #
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
|
| #
890e9413 |
| 20-Nov-2007 |
Jon Loeliger <jdl@freescale.com> |
Merge commit 'remotes/wd/master'
|
| #
f92edbd8 |
| 20-Nov-2007 |
Grant Likely <grant.likely@secretlab.ca> |
Merge branch 'origin' into kconfig-for-1.3.1
|
| #
409ecdc0 |
| 18-Nov-2007 |
Wolfgang Denk <wd@denx.de> |
Fix compiler warnings for PPC systems. Update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
| #
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
|
| #
93f79834 |
| 21-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
|
| #
1d55483c |
| 18-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx
|
| #
81735b25 |
| 16-Aug-2007 |
John Rigby <jrigby@freescale.com> |
Merge branch 'denx-coldfire' into coldfire-aug2007
|
| #
fc997013 |
| 16-Aug-2007 |
Stefan Roese <sr@denx.de> |
Merge with git://www.denx.de/git/u-boot.git
|
| #
592391a6 |
| 16-Aug-2007 |
Wolfgang Denk <wd@denx.de> |
Merge with /home/wd/git/u-boot/master
|
| #
002275a3 |
| 16-Aug-2007 |
Michal Simek <Monstr@seznam.cz> |
Bios emulator - fix microblaze toolchain problem
microblaze CPU have problem with bios_emulator code.
Microblaze toolchain doesn't support PRAGMA PACK.
Signed-off-by: Michal Sim
Bios emulator - fix microblaze toolchain problem
microblaze CPU have problem with bios_emulator code.
Microblaze toolchain doesn't support PRAGMA PACK.
Signed-off-by: Michal Simek <monstr@monstr.eu>
show more ...
|
| #
78cff50e |
| 16-Aug-2007 |
Michal Simek <monstr@monstr.eu> |
[FIX] Changes for bios_emulator code for others architecture
|
| #
5b4de930 |
| 15-Aug-2007 |
Michal Simek <monstr@monstr.eu> |
[FIX] Resolve problem with warnings
microblaze toolchain don't support PRAGMA PACK.
|
| #
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
|