| commit | 9d62f20d0861ef87460d073dc189c851715b46ae | [log] [tgz] |
|---|---|---|
| author | Minkyu Kang <mk7.kang@samsung.com> | Mon May 10 15:20:50 2010 +0900 |
| committer | Minkyu Kang <mk7.kang@samsung.com> | Mon May 10 15:20:50 2010 +0900 |
| tree | 43a05c86e947f01079879735ddf93218870df50b | |
| parent | 6596753387c3310b86f75bebe464684d70651052 [diff] | |
| parent | e0531f975ce124f4ebdd9c7b7b107673c5628f68 [diff] |
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>