Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Wed, 20 Oct 2010 21:44:20 +0000 (14:44 -0700)
committerColin Cross <ccross@android.com>
Wed, 20 Oct 2010 21:44:20 +0000 (14:44 -0700)
1  2 
arch/arm/mach-tegra/suspend.c
drivers/i2c/busses/i2c-tegra.c

Simple merge
Simple merge