From: Erik Gilling <konkers@android.com>
Date: Wed, 1 Dec 2010 21:47:08 +0000 (-0800)
Subject: Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~303
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d9a6efe6f7b3365f3bd02ea455bce0883f6704f5;p=firefly-linux-kernel-4.4.55.git

Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: I89b84ed867e185ad25c5955f3de946fcbc254b75
---

d9a6efe6f7b3365f3bd02ea455bce0883f6704f5
diff --cc drivers/i2c/busses/i2c-tegra.c
index 30eeb204416b,b7481f496ec3..fd88ba3cd003
mode 100644,100755..100755
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c