From: Minkyu Kang <mk7.kang@samsung.com>
Date: Fri, 2 Apr 2010 00:50:42 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot
X-Git-Tag: JD02_20100402^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02671fa1ee1ad697d0e7ee1f7d950208c4cbc139;p=kernel%2Fu-boot.git

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

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