Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Thu, 7 Oct 2010 00:52:13 +0000 (17:52 -0700)
committerColin Cross <ccross@android.com>
Thu, 7 Oct 2010 00:52:13 +0000 (17:52 -0700)

Trivial merge