| commit | ecbbd1b52c02a47dc619f5d219150ae4514984e9 | [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 | 3b85e41972b2f960de72e4b654107bf2a15dbad9 [diff] | |
| parent | ad43ae43d9b4a3f3e6c9a7f591e61a25a25fee11 [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>