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)
Change-Id: I3a5bce1a80f73fd289031d7f329b67eaaf6ce8b5

1  2 
drivers/i2c/busses/i2c-tegra.c

Simple merge