diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-02-23 10:34:39 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-02-23 10:34:39 +0100 |
| commit | 156feb90d200f186cdfd856d7f6f1878bb1bec1e (patch) | |
| tree | eba5714fefee9dfcc0cc797ad0aeceaadc04c407 /include/asm-blackfin/config.h | |
| parent | ea393eb1d6a786fc2e895f90abb5f7e7541aef45 (diff) | |
| parent | a69a42338dd25408f9fd5390a83bc501749c7e1b (diff) | |
| download | u-boot-imx-156feb90d200f186cdfd856d7f6f1878bb1bec1e.zip u-boot-imx-156feb90d200f186cdfd856d7f6f1878bb1bec1e.tar.gz u-boot-imx-156feb90d200f186cdfd856d7f6f1878bb1bec1e.tar.bz2 | |
Merge branch 'mimc200' into next
Conflicts:
board/mimc/mimc200/mimc200.c
include/configs/mimc200.h
Diffstat (limited to 'include/asm-blackfin/config.h')
0 files changed, 0 insertions, 0 deletions