| commit | 72fcb856f28adeda83c25b74d331153126ba41d8 | [log] [tgz] |
|---|---|---|
| author | Minkyu Kang <mk7.kang@samsung.com> | Mon May 31 09:13:11 2010 +0900 |
| committer | Minkyu Kang <mk7.kang@samsung.com> | Mon May 31 09:13:11 2010 +0900 |
| tree | c5ef3d5dc70bf51646a7fd7a379f6c2b2588cc2e | |
| parent | e639d0e7fda861920608d0479c31e9f436753733 [diff] | |
| parent | af975e8dbe96901826752ff153837ca6edf7f1f7 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: arch/arm/include/asm/mach-types.h Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>