Merge branch 'master' of git://git.denx.de/u-boot

Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:
	Makefile
	arch/arm/cpu/arm1176/s5p64xx/Makefile
	arch/arm/cpu/arm1176/s5p64xx/cpu_info.c
	arch/arm/cpu/arm926ejs/mb86r0x/Makefile
	arch/arm/cpu/arm926ejs/start.S
	arch/arm/cpu/armv7/s5p-common/Makefile
	arch/arm/cpu/armv7/s5p-common/cpu_info.c
	arch/arm/cpu/armv7/s5pc1xx/Makefile
	arch/arm/cpu/armv7/s5pc1xx/clock.c
	arch/arm/cpu/armv7/s5pc1xx/cpu_info.c
	arch/arm/cpu/armv7/start.S
	arch/arm/include/asm/arch-s5pc1xx/clk.h
	arch/arm/include/asm/arch-s5pc1xx/cpu.h
	arch/arm/include/asm/arch-s5pc1xx/hs_otg.h
	arch/arm/include/asm/arch-s5pc1xx/mmc.h
	arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h
	board/eukrea/cpuat91/cpuat91.c
	board/overo/overo.c
	board/samsung/universal_c210/Makefile
	common/cmd_mmc.c
	common/env_onenand.c
	cpu/arm_cortexa8/omap3/Makefile
	drivers/mmc/s5p_mmc.c
	drivers/serial/Makefile
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/config.c
	drivers/usb/gadget/epautoconf.c
	drivers/usb/gadget/ether.c
	drivers/usb/gadget/gadget_chips.h
	drivers/usb/gadget/usbstring.c
	include/asm-arm/arch-davinci/nand_defs.h
	include/configs/cpuat91.h
	include/linux/usb/cdc.h
	include/linux/usb/ch9.h
	include/linux/usb/gadget.h
	mmc_ipl/mmc_boot.c
	onenand_ipl/board/samsung/universal_c210/u-boot-onenand.lds

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>