| commit | 2216debf61e54a4ef6d9a18212146b0a46fe6d93 | [log] [tgz] |
|---|---|---|
| author | Minkyu Kang <mk7.kang@samsung.com> | Tue Mar 23 19:09:13 2010 +0900 |
| committer | Minkyu Kang <mk7.kang@samsung.com> | Tue Mar 23 19:09:13 2010 +0900 |
| tree | 8bcaee16cda9d8f90f5b596566ad2122c6d8d86b | |
| parent | e4ed029ca0453025603907677c21d43073c36dd2 [diff] | |
| parent | 957f7b5e61aabbb9a3f150b75e1f01602dbea3bd [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Conflicts: cpu/arm920t/ep93xx/timer.c Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>