]> git.sur5r.net Git - u-boot/commit - cpu/arm926ejs/nomadik/Makefile
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f1f21a 07739bc)
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 19 Apr 2010 01:26:18 +0000 (10:26 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 19 Apr 2010 01:26:18 +0000 (10:26 +0900)
commit83653121d7382fccfe329cb732f77f116341ef1d
tree0b1ce6764252af15dfb2614372de98a44a7ec61ftree | snapshot
parent0f1f21a345e02a68ec16f7ab9e7dc687f9276089commit | diff
parent07739bcef5da07cc4a4edef8b91014ccc332eda3commit | 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>
Cloned from git://git.denx.de/u-boot.git