From: Minkyu Kang <mk7.kang@samsung.com>
Date: Fri, 30 Oct 2009 03:14:40 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2010.09-rc1~28^2~7^2~41
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0bf7de838096e804f0cece8f2d94905477381b6e;p=u-boot

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
---

0bf7de838096e804f0cece8f2d94905477381b6e