| commit | c385065770e8668d04fc558bcc4973a0df3be225 | [log] [tgz] |
|---|---|---|
| author | Minkyu Kang <mk7.kang@samsung.com> | Fri Oct 30 12:14:40 2009 +0900 |
| committer | Minkyu Kang <mk7.kang@samsung.com> | Fri Oct 30 12:14:40 2009 +0900 |
| tree | fc57495ade62aeba85b935353955a28444e5b65b | |
| parent | 72af81930f31c2e3b2b0eda4e808ed6bd4b1ca31 [diff] | |
| parent | b3ec49d845ff891b58399bebe1912c374742afc3 [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