| commit | e598dfc22c8789991d165714bec53b2390fc999d | [log] [tgz] |
|---|---|---|
| author | Minkyu Kang <mk7.kang@samsung.com> | Fri Jan 15 22:41:58 2010 +0900 |
| committer | Minkyu Kang <mk7.kang@samsung.com> | Fri Jan 15 22:41:58 2010 +0900 |
| tree | cf3c704c4b00e06605bdfe23384b8af97022efa6 | |
| parent | e7ae13a57b4cbaa2cd3da8ffca614853d9d84230 [diff] | |
| parent | 1c2a8e359ebbec0dbef62f5b54c72f9cd72ccd59 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: cpu/arm_cortexa8/s5pc1xx/cache.c include/asm-arm/arch-s5pc1xx/sys_proto.h include/sja1000.h Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>