projects / kernel / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e6f6c67 0b692dc)
Merge branch 'master' of http://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Thu, 18 Feb 2010 02:02:21 +0000 (11:02 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Thu, 18 Feb 2010 02:02:21 +0000 (11:02 +0900)
commitc1afc719439de56f926e58dd08dfa0edb4c004c0
treeea89ecc84ebdf10a16042442f6b78d82de1cc56ftree | snapshot
parente6f6c67525f80dffa19f01adeba5f91dcf85c51ccommit | diff
parent0b692dcb190655c7eb96b6b8003bee163e3b58ddcommit | diff
Merge branch 'master' of http://git.denx.de/u-boot

Conflicts:

cpu/arm_cortexa8/s5pc1xx/Makefile
cpu/arm_cortexa8/s5pc1xx/cache.c
lib_ppc/reloc.S
onenand_ipl/board/samsung/universal/u-boot-onenand.lds

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Makefile diff1 | diff2 | blob | history
common/lcd.c diff1 | diff2 | blob | history
cpu/arm_cortexa8/s5pc1xx/Makefile diff1 | diff2 | blob | history
drivers/i2c/Makefile diff1 | diff2 | blob | history
drivers/net/smc911x.c diff1 | diff2 | blob | history
drivers/video/Makefile diff1 | diff2 | blob | history
include/common.h diff1 | diff2 | blob | history
include/configs/smdkc100.h diff1 | diff2 | blob | history
Domain: System / Kernel;