]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 10 May 2010 06:20:50 +0000 (15:20 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 10 May 2010 06:20:50 +0000 (15:20 +0900)
commit9d62f20d0861ef87460d073dc189c851715b46ae
tree43a05c86e947f01079879735ddf93218870df50b
parent6596753387c3310b86f75bebe464684d70651052
parente0531f975ce124f4ebdd9c7b7b107673c5628f68
Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
arch/arm/include/asm/mach-types.h
common/serial.c

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>