| commit | 83653121d7382fccfe329cb732f77f116341ef1d | [log] [tgz] |
|---|---|---|
| author | Minkyu Kang <mk7.kang@samsung.com> | Mon Apr 19 10:26:18 2010 +0900 |
| committer | Minkyu Kang <mk7.kang@samsung.com> | Mon Apr 19 10:26:18 2010 +0900 |
| tree | 0b1ce6764252af15dfb2614372de98a44a7ec61f | |
| parent | 0f1f21a345e02a68ec16f7ab9e7dc687f9276089 [diff] | |
| parent | 07739bcef5da07cc4a4edef8b91014ccc332eda3 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: cpu/arm1176/cpu.c cpu/arm1176/start.S cpu/arm_cortexa8/s5pc1xx/Makefile cpu/arm_cortexa8/s5pc1xx/clock.c drivers/serial/serial_s5p.c include/asm-arm/arch-s5pc1xx/clk.h include/asm-arm/arch-s5pc1xx/gpio.h include/asm-arm/arch-s5pc1xx/uart.h Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>