| #
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
|
| #
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>
|