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)
commitaa40263c6a5f55c554734ff9c1463944421c3f7e
tree84cf5a028856e2068eaa8561d817aca22ed50a00
parentc69293a1c94270f922ddb460234ee5b377b31a45
parent4ab096ce9c6532f3876d1cbb71462f7a7101003b
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
arch/arm/mach-tegra/suspend.c
drivers/i2c/busses/i2c-tegra.c