Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 1 Dec 2010 21:47:08 +0000 (13:47 -0800)
committerErik Gilling <konkers@android.com>
Wed, 1 Dec 2010 21:47:14 +0000 (13:47 -0800)
commitd9a6efe6f7b3365f3bd02ea455bce0883f6704f5
tree6cae4e872e0423287ee6576c07993108f294704c
parente9ba5a3542c60d8ace62e66415bc06f89a9c1c9a
parent4ed4afb836315bbfc12f1fec212c771f0835c93a
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: I89b84ed867e185ad25c5955f3de946fcbc254b75
arch/arm/mach-tegra/tegra2_clocks.c
drivers/i2c/busses/i2c-tegra.c