tree 8bcaee16cda9d8f90f5b596566ad2122c6d8d86b
parent e4ed029ca0453025603907677c21d43073c36dd2
parent 957f7b5e61aabbb9a3f150b75e1f01602dbea3bd
author Minkyu Kang <mk7.kang@samsung.com> 1269338953 +0900
committer Minkyu Kang <mk7.kang@samsung.com> 1269338953 +0900

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>