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

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

Conflicts:

	Makefile
	board/eukrea/cpu9260/cpu9260.c
	board/samsung/smdkc100/Makefile
	board/samsung/smdkc100/lowlevel_init.S
	board/samsung/smdkc100/mem_setup.S
	board/samsung/smdkc100/onenand.c
	board/samsung/smdkc100/smdkc100.c
	cpu/arm_cortexa8/s5pc1xx/Makefile
	cpu/arm_cortexa8/s5pc1xx/clock.c
	cpu/arm_cortexa8/start.S
	drivers/serial/serial_s5pc1xx.c
	include/asm-arm/arch-s5pc1xx/clk.h
	include/asm-arm/arch-s5pc1xx/clock.h
	include/asm-arm/arch-s5pc1xx/gpio.h
	include/asm-arm/arch-s5pc1xx/power.h
	include/configs/cpu9260.h
	include/configs/cpuat91.h
	include/configs/davinci_dm355evm.h
	include/configs/smdkc100.h
	include/linux/mtd/onenand.h
	include/linux/mtd/onenand_regs.h

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>