commit | 7772c13ba07eaabd42499998f3713b23350fc119 | [log] [tgz] |
---|---|---|
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | Wed Aug 06 15:12:38 2008 +0200 |
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | Wed Aug 06 15:12:38 2008 +0200 |
tree | 32718a8e67114d0ea5dbdb1fdcf58aad09dd52dc | |
parent | b2b15ebb66f0e7958dff8916077da0aceb2982a8 [diff] | |
parent | 0eb5717a85b6cba3f67c11fa89bdde38dcd081b5 [diff] |
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32 Conflicts: MAINTAINERS MAKEALL Makefile