| commit | 4fb0d78c388428cc87dff921f4d3ead1e20ee43b | [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 | 333567c67b154497f27b4a0c232c66e9b65ee747 [diff] | |
| parent | c8db08fe9785850f50b1d8a838ab4c8ba5298cde [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>