git.sur5r.net Git - u-boot/commit

]> git.sur5r.net Git - u-boot/commit

author	Minkyu Kang <mk7.kang@samsung.com>
	Tue, 23 Mar 2010 10:09:13 +0000 (19:09 +0900)
committer	Minkyu Kang <mk7.kang@samsung.com>
	Tue, 23 Mar 2010 10:09:13 +0000 (19:09 +0900)
commit	45e565337a90bbca0c1bb712b5e008b7c0b18bd5
tree	8bcaee16cda9d8f90f5b596566ad2122c6d8d86b	tree \| snapshot
parent	995a4b1d83a08223c82c1e15778b02e85e5bba51	commit \| diff
parent	d650da2dd4af99967aabc43cccbd8f160eb4cea6	commit \| 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>

Cloned from git://git.denx.de/u-boot.git