Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Tue, 23 Mar 2010 10:09:13 +0000 (19:09 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Tue, 23 Mar 2010 10:09:13 +0000 (19:09 +0900)
Conflicts:

cpu/arm920t/ep93xx/timer.c

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge