Merge branch 'master' of git://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Sun, 23 Aug 2009 23:24:55 +0000 (08:24 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Sun, 23 Aug 2009 23:24:55 +0000 (08:24 +0900)
commit94bdf14c35b6f643b5ec3cee956070501d5fb7fa
treeb2a1f25369920f70fcc03e0360fcfa37f2bdc5d0
parentd077fbc5a8ffce1d3b741bfcae5cc54996a87756
parenta794f59a75bf9fd4a44f1ad2349cae903c42b89c
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>
.gitignore
Makefile
board/samsung/universal/universal.c