projects / kernel / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9e149dc 40792d6)
Merge branch 'master' of git://git.denx.de/u-boot
authorMinkyu Kang <mk7.kang@samsung.com>
Wed, 26 May 2010 01:11:33 +0000 (10:11 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Wed, 26 May 2010 01:11:33 +0000 (10:11 +0900)
commit0477a891de486aa528f5b3c437ea27731e9b238e
tree7915a0a514263dae8550f44d0f9a3cec068d37b8tree | snapshot
parent9e149dc59b97aaf2dd502b60a4134c89883bd0cccommit | diff
parent40792d675a609c83621d098e48a89de07463b3cdcommit | diff
Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:
common/cmd_onenand.c
cpu/arm1176/cpu.c
cpu/arm1176/start.S
cpu/arm_cortexa8/s5pc1xx/Makefile
cpu/arm_cortexa8/s5pc1xx/clock.c
drivers/serial/Makefile
drivers/serial/serial_s5pc1xx.c
drivers/video/Makefile
include/asm-arm/arch-s5pc1xx/clk.h
include/asm-arm/arch-s5pc1xx/gpio.h
include/common.h
include/configs/smdkc100.h
include/serial.h
lib_arm/eabi_compat.c

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
87 files changed:
Makefile diff1 | diff2 | blob | history
arch/arm/cpu/arm1176/s5p64xx/Makefile diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/clock.c diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/cpu_info.c diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/gpio.c diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/i2c-gpio.c diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/reset.S diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/sleep.c diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/sleep.h diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/sleep_asm.S diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/timer.c diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/usb-hs-otg.c diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/usb-hs-otg.h diff1 | | blob | history
arch/arm/cpu/arm1176/s5p64xx/usb_downloader.c diff1 | | blob | history
arch/arm/cpu/arm1176/start.S diff1 | diff2 | blob | history
arch/arm/cpu/arm_cortexa8/config.mk diff1 | diff2 | blob | history
arch/arm/cpu/arm_cortexa8/cpu.c diff1 | diff2 | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile | diff2 | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/clock.c diff1 | diff2 | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/cpu_info.c diff1 | diff2 | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/i2c-gpio.c | | blob
arch/arm/cpu/arm_cortexa8/s5pc1xx/sleep.c diff1 | | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/sleep.h diff1 | | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/sleep_asm.S diff1 | | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/timer.c diff1 | diff2 | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/usb-hs-otg.c diff1 | | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/usb-hs-otg.h diff1 | | blob | history
arch/arm/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c diff1 | | blob | history
arch/arm/cpu/arm_cortexa8/start.S diff1 | diff2 | blob | history
arch/arm/include/asm/arch-omap3/sys_proto.h diff1 | diff2 | blob | history
arch/arm/include/asm/arch-s5p64xx/clk.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/clock.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/cpu.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/gpio.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/i2c.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/keypad.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/mem.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/mmc.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/power.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/pwm.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/regs-fb.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/sys_proto.h diff1 | | blob | history
arch/arm/include/asm/arch-s5p64xx/uart.h | | blob
arch/arm/include/asm/arch-s5p64xx/usb-hs-otg.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/adc.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/clock.h diff1 | diff2 | blob | history
arch/arm/include/asm/arch-s5pc1xx/cpu.h diff1 | diff2 | blob | history
arch/arm/include/asm/arch-s5pc1xx/hs_otg.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/i2c.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/keypad.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/mem.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/mmc.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/power.h diff1 | diff2 | blob | history
arch/arm/include/asm/arch-s5pc1xx/regs-fb.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/regs-otg.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/rtc.h diff1 | | blob | history
arch/arm/include/asm/arch-s5pc1xx/usb-hs-otg.h diff1 | | blob | history
arch/arm/include/asm/assembler.h diff1 | | blob | history
arch/arm/lib/Makefile | diff2 | blob | history
arch/arm/lib/_memcpy32.S diff1 | | blob | history
board/samsung/p1p2/p1p2.c diff1 | | blob | history
board/samsung/universal/gpio_setting.h diff1 | | blob | history
board/samsung/universal/universal.c diff1 | | blob | history
common/cmd_mtdparts.c diff1 | diff2 | blob | history
common/cmd_onenand.c diff1 | diff2 | blob | history
common/cmd_ubi.c diff1 | diff2 | blob | history
common/cmd_usbd.c diff1 | | blob | history
common/serial.c diff1 | diff2 | blob | history
drivers/i2c/Makefile diff1 | diff2 | blob | history
drivers/net/smc911x.c diff1 | diff2 | blob | history
drivers/serial/Makefile diff1 | diff2 | blob | history
drivers/serial/serial_s5p.c | diff2 | blob | history
drivers/video/Makefile diff1 | diff2 | blob | history
drivers/video/s5p-spi.h diff1 | | blob | history
include/configs/smdkc100.h diff1 | diff2 | blob | history
include/net.h diff1 | diff2 | blob | history
include/serial.h diff1 | diff2 | blob | history
lib/Makefile diff1 | diff2 | blob | history
onenand_ipl/board/samsung/smdk6442/Makefile diff1 | | blob | history
onenand_ipl/board/samsung/smdkc100/Makefile diff1 | | blob | history
onenand_ipl/board/samsung/universal/Makefile diff1 | | blob | history
recovery/board/samsung/universal/Makefile diff1 | | blob | history
recovery/board/samsung/universal/gpio.c diff1 | | blob | history
recovery/board/samsung/universal/universal.c diff1 | | blob | history
recovery/config.mk diff1 | | blob | history
recovery/drivers/serial/serial_s5pc1xx.c diff1 | | blob | history
recovery/serial.c diff1 | | blob | history
Domain: System / Kernel;