]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
projects / karo-tx-uboot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d43bc3d 4bc3d2a)
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Fri, 30 Oct 2009 03:14:40 +0000 (12:14 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Fri, 30 Oct 2009 03:14:40 +0000 (12:14 +0900)
commit0bf7de838096e804f0cece8f2d94905477381b6e
treefc57495ade62aeba85b935353955a28444e5b65btree | snapshot
parentd43bc3d2d09022bcffa1302b8f51e7fabe2dc68acommit | diff
parent4bc3d2afb380e78fdbb9c501d9a8da6d59eb178ecommit | diff
Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:

board/eukrea/cpu9260/cpu9260.c
drivers/serial/serial_s5pc1xx.c
include/asm-arm/arch-s5pc1xx/clock.h
include/asm-arm/arch-s5pc1xx/gpio.h
include/asm-arm/arch-s5pc1xx/pwm.h
include/asm-arm/arch-s5pc1xx/uart.h
include/configs/cpu9260.h
include/configs/cpuat91.h
include/configs/davinci_dm355evm.h
include/linux/mtd/samsung_onenand.h
drivers/net/smc911x.c diff1 | diff2 | blob | history
UBoot for KaRo TX COM modules