]> git.sur5r.net Git - u-boot/commit
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 6 Aug 2008 13:12:38 +0000 (15:12 +0200)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 6 Aug 2008 13:12:38 +0000 (15:12 +0200)
commit7772c13ba07eaabd42499998f3713b23350fc119
tree32718a8e67114d0ea5dbdb1fdcf58aad09dd52dc
parentb2b15ebb66f0e7958dff8916077da0aceb2982a8
parent0eb5717a85b6cba3f67c11fa89bdde38dcd081b5
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32

Conflicts:

MAINTAINERS
MAKEALL
Makefile
MAINTAINERS
MAKEALL
Makefile