| commit | 27961d6a49170a05a89d54a8f08e74a5fc4483c3 | [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 | dbaeca017f6ed791a5004c355dafe25b88c81716 [diff] | |
| parent | b26e259e6656a7754f941f06a9927fd4407b77e2 [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>