]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Fri, 15 Jan 2010 13:41:58 +0000 (22:41 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Fri, 15 Jan 2010 13:41:58 +0000 (22:41 +0900)
commite598dfc22c8789991d165714bec53b2390fc999d
treecf3c704c4b00e06605bdfe23384b8af97022efa6
parente7ae13a57b4cbaa2cd3da8ffca614853d9d84230
parent1c2a8e359ebbec0dbef62f5b54c72f9cd72ccd59
Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:

cpu/arm_cortexa8/s5pc1xx/cache.c
include/asm-arm/arch-s5pc1xx/sys_proto.h
include/sja1000.h

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
drivers/net/smc911x.c