Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Mon, 18 Oct 2010 23:20:49 +0000 (16:20 -0700)
committerColin Cross <ccross@android.com>
Mon, 18 Oct 2010 23:20:49 +0000 (16:20 -0700)

Trivial merge