Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 5 Jan 2011 01:54:53 +0000 (17:54 -0800)
committerErik Gilling <konkers@android.com>
Wed, 5 Jan 2011 01:55:08 +0000 (17:55 -0800)
commit02cd7ffa55db4bf6cb6fc5236e92df20fe16e51e
tree8825697c9810fb8bc5df3a18f54740657302d80e
parent037490d0e6f0bedd7b48ce30b886205bd7a2a23e
parent00756cc5246293c02669eb9c13f2245f3cfa2706
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: I3a5bce1a80f73fd289031d7f329b67eaaf6ce8b5
drivers/i2c/busses/i2c-tegra.c