| commit | a1b8c966a5d2ed7b4138251bccf9375aae90f785 | [log] [tgz] |
|---|---|---|
| author | Minkyu Kang <mk7.kang@samsung.com> | Sat Feb 06 17:20:09 2010 +0900 |
| committer | Minkyu Kang <mk7.kang@samsung.com> | Sat Feb 06 17:20:09 2010 +0900 |
| tree | 4da072aceaa42e7ff3ec9962f5d99a9ca667ace9 | |
| parent | 06e515b11d63ffd1edf101d728bfd494baebc9c0 [diff] | |
| parent | bbb851442b949fabb1a4a2b92a627be5471d7e20 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: cpu/arm_cortexa8/s5pc1xx/cache.c include/configs/spear6xx.h lib_ppc/reloc.S Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>