Merge branch 'master' of http://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Tue, 12 Jan 2010 09:15:00 +0000 (18:15 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Tue, 12 Jan 2010 09:15:00 +0000 (18:15 +0900)
commita934fa4459c976888ceeb187a198e865eebb9e12
treebe84d1143009bea825efc061ee96ebe866591998
parentaaad7e2c9de4b4193c8e5ceed5432c80f7e0fc3c
parent6ca9da4d42aeb43df5ef29f7d0518009df583b2f
Merge branch 'master' of http://git.denx.de/u-boot

Conflicts:

common/env_onenand.c
drivers/mtd/onenand/onenand_base.c
include/linux/mtd/onenand_regs.h

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
16 files changed:
Makefile
common/Makefile
common/cmd_onenand.c
common/env_onenand.c
cpu/arm_cortexa8/s5pc1xx/timer.c
drivers/i2c/Makefile
drivers/mtd/onenand/onenand_base.c
drivers/mtd/onenand/onenand_bbt.c
include/common.h
include/configs/smdkc100.h
include/linux/mtd/onenand.h
include/linux/mtd/onenand_regs.h
include/net.h
include/onenand_uboot.h
lib_generic/Makefile
net/net.c