]> git.sur5r.net Git - u-boot/commit
Merge branch 'mimc200' into next
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Mon, 23 Feb 2009 09:34:39 +0000 (10:34 +0100)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Mon, 23 Feb 2009 09:34:39 +0000 (10:34 +0100)
commit156feb90d200f186cdfd856d7f6f1878bb1bec1e
treeeba5714fefee9dfcc0cc797ad0aeceaadc04c407
parentea393eb1d6a786fc2e895f90abb5f7e7541aef45
parenta69a42338dd25408f9fd5390a83bc501749c7e1b
Merge branch 'mimc200' into next

Conflicts:

board/mimc/mimc200/mimc200.c
include/configs/mimc200.h
board/mimc/mimc200/mimc200.c
include/configs/mimc200.h