author | Minkyu Kang <mk7.kang@samsung.com> | |
Mon, 10 May 2010 06:20:50 +0000 (15:20 +0900) | ||
committer | Minkyu Kang <mk7.kang@samsung.com> | |
Mon, 10 May 2010 06:20:50 +0000 (15:20 +0900) |
Conflicts:
arch/arm/include/asm/mach-types.h
common/serial.c
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
arch/arm/include/asm/mach-types.h
common/serial.c
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Trivial merge