Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Wed, 22 Dec 2010 02:38:24 +0000 (18:38 -0800)
committerColin Cross <ccross@android.com>
Wed, 22 Dec 2010 02:38:24 +0000 (18:38 -0800)

Trivial merge