]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
Merge branch 'mimc200' of git://git.denx.de/u-boot-avr32
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 20 Aug 2008 07:12:28 +0000 (09:12 +0200)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed, 20 Aug 2008 07:12:28 +0000 (09:12 +0200)
commit7321d7e7b6a96a9eed02e65d2d4377391dc7ea83
tree4a31c8593505e06598eea72cc17806377eda919e
parent7772c13ba07eaabd42499998f3713b23350fc119
parent13b50fe3bc065c48911fa373231421280855a9d6
Merge branch 'mimc200' of git://git.denx.de/u-boot-avr32

Conflicts:

MAKEALL
Makefile
MAINTAINERS
MAKEALL
Makefile