From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Wed, 2 Sep 2009 08:56:09 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot
X-Git-Tag: 20091016~78^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a473ec4e03d416d1981550310ecfc010fc368944;p=kernel%2Fu-boot.git

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

Conflicts:

	drivers/mtd/onenand/onenand_base.c
	include/linux/mtd/onenand.h

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

a473ec4e03d416d1981550310ecfc010fc368944