summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-08-06 15:12:38 +0200
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-08-06 15:12:38 +0200
commit7772c13ba07eaabd42499998f3713b23350fc119 (patch)
tree32718a8e67114d0ea5dbdb1fdcf58aad09dd52dc /CREDITS
parentb2b15ebb66f0e7958dff8916077da0aceb2982a8 (diff)
parent0eb5717a85b6cba3f67c11fa89bdde38dcd081b5 (diff)
downloadu-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.zip
u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.gz
u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.bz2
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
Conflicts: MAINTAINERS MAKEALL Makefile
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions