From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Wed, 31 Mar 2010 05:56:43 +0000 (+0900)
Subject: Merge branch 'master' of http://git.denx.de/u-boot
X-Git-Tag: JD02_20100402~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed2e82dab95ccc1a2846b18e6cd14397bbd388a0;p=kernel%2Fu-boot.git

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

ed2e82dab95ccc1a2846b18e6cd14397bbd388a0
diff --cc drivers/i2c/Makefile
index c024c9c,29bda85..c024c9c
mode 100755,100644..100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile