]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcd69a1 33eac2b)
Merge branch 'next' of git://git.denx.de/u-boot-avr32
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 20 Aug 2008 07:37:09 +0000 (09:37 +0200)
Conflicts:

MAINTAINERS

1  2 
CREDITS patch | diff1 | diff2 | blob | history
MAINTAINERS patch | diff1 | diff2 | blob | history
MAKEALL patch | diff1 | diff2 | blob | history
Makefile patch | diff1 | diff2 | blob | history

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
Cloned from git://git.denx.de/u-boot.git