diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-05-31 09:13:11 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-05-31 09:13:11 +0900 |
| commit | 922d27b596c179c5a7d68abe45ede5adb1b6589c (patch) | |
| tree | c5ef3d5dc70bf51646a7fd7a379f6c2b2588cc2e /MAKEALL | |
| parent | de200874fb9ecac51d74b4e9783ebb5d2e94c449 (diff) | |
| parent | 39c209546ab5b11ca6410c5cc57dcbf457e50800 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/include/asm/mach-types.h
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'MAKEALL')
| -rwxr-xr-x | MAKEALL | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -186,6 +186,7 @@ LIST_4xx=" \ ADCIOP \ alpr \ AP1000 \ + APC405 \ AR405 \ arches \ ASH405 \ @@ -223,6 +224,7 @@ LIST_4xx=" \ hcu5 \ HH405 \ HUB405 \ + icon \ intip \ JSE \ KAREF \ |