review.tizen.org Git - kernel/u-boot.git/commit

author	Kyungmin Park <kyungmin.park@samsung.com>
	Thu, 20 Aug 2009 05:23:49 +0000 (14:23 +0900)
committer	Kyungmin Park <kyungmin.park@samsung.com>
	Thu, 20 Aug 2009 05:23:49 +0000 (14:23 +0900)
commit	90e00670ca935229db81de848433533cf297a966
tree	ab906abcfebda065b1ee73d1943f35b590baad9b	tree \| snapshot
parent	edd8f06374f21b8d210e464d3f4896025317792b	commit \| diff
parent	2bcbd429f44e32ead38a33f372e4c027e66710f9	commit \| diff

Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:

cpu/arm_cortexa8/config.mk

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>