Merge branch 'master' of git://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Thu, 23 Jul 2009 08:24:39 +0000 (17:24 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Thu, 23 Jul 2009 08:24:39 +0000 (17:24 +0900)
commit23245e471fc824b493789b1487b65d2bdaa4bb2d
tree6faea59034586e123939a625f1ac0e68896ba391
parent75758b42bd66ebf1343d503e97a830625672166f
parent189eec77795553157c087cd45555695fb3ce2433
Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:

cpu/arm_cortexa8/start.S

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Makefile
cpu/arm_cortexa8/start.S